From 38419164b6f1ade468bf4b1d27929b3ac2503b6e Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 26 Feb 2016 14:22:11 -0500
Subject: [PATCH 001/108] optional.hpp:  Allow easy access to contained type

---
 include/fc/optional.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/fc/optional.hpp b/include/fc/optional.hpp
index dfb725d..bb760a5 100644
--- a/include/fc/optional.hpp
+++ b/include/fc/optional.hpp
@@ -18,9 +18,11 @@ namespace fc {
    *  fc::optional adds less than 400.
    */
   template<typename T>
-  class optional 
+  class optional
   {
     public:
+      typedef T value_type;
+
       optional():_valid(false){}
       ~optional(){ reset(); }
 

From d5370fc2ea436fa4340cda01af98c7993fbc67d5 Mon Sep 17 00:00:00 2001
From: Eric Frias <efrias@syncad.com>
Date: Thu, 3 Mar 2016 16:42:36 -0500
Subject: [PATCH 002/108] Update the websocketpp library and change the
 configuration options we pass when creating the websocket servers to enable
 deflate compression on websocket frames.  This is relevant to
 cryptonomex/graphene#540 because the spammed data is higly compressible.  In
 my tests, it reduces bandwidth for a single idle node by a factor of ~16,
 from 577kbps down to 36kbps. This doesn't require any changes to the wallets,
 simply upgrading the public servers will begin sending compressed data to all
 clients that support it. Note: this commit adds a dependency on zlib for
 non-apple platforms (it was already required on apple)

---
 CMakeLists.txt                 | 19 ++++++-----
 src/network/http/websocket.cpp | 62 ++++++++++------------------------
 vendor/websocketpp             |  2 +-
 3 files changed, 29 insertions(+), 54 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9931b9a..eeadd2b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,6 +142,17 @@ find_package(OpenSSL REQUIRED)
 
 set( CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_LIB_SUFFIXES} )
 
+# We are now building in support for deflate compression into our websockets layer by default,
+# which requires zlib.  Aside from that, all of fc compiles without zlib, so this could be
+# made optional without much effort
+# (important exception, apple: as of 10.10 yosemite, the OpenSSL static libraries shipped with 
+# os x have a dependency on zlib)
+# On a side note, fc's fc::zlib_compress() function uses a separate implementation of zlib
+# from the miniz library.  If we're comfortable requiring an external zlib, we can 
+# reimplement fc::zlib_compress() to call the real zlib, and remove miniz.c from our
+# repository.
+find_package( ZLIB REQUIRED )
+
 option( UNITY_BUILD OFF )
 
 set( fc_sources
@@ -473,14 +484,6 @@ if(WIN32)
 
 endif(WIN32)
 
-IF(APPLE)
-  # As of 10.10 yosemite, the OpenSSL static libraries shipped with os x have a dependency
-  # on zlib, so any time you link in openssl you also need to link zlib.  .  We really want to detect whether openssl was configured with the --no-zlib
-  # option or not when it was built, but that's difficult to do in practice, so we
-  # just always try to link it in on mac.
-  find_package( ZLIB REQUIRED )
-ENDIF(APPLE)
-
 SET(OPENSSL_CONF_TARGET )
 IF(DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   SET (OPENSSL_CONF_TARGET ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index 67745d9..c75f0e8 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -3,6 +3,7 @@
 #include <websocketpp/config/asio.hpp>
 #include <websocketpp/server.hpp>
 #include <websocketpp/config/asio_client.hpp>
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
 #include <websocketpp/client.hpp>
 #include <websocketpp/logger/stub.hpp>
 
@@ -61,47 +62,12 @@ namespace fc { namespace http {
               transport_type;
 
           static const long timeout_open_handshake = 0;
-      };
-      struct asio_tls_with_stub_log : public websocketpp::config::asio_tls {
-
-          typedef asio_with_stub_log type;
-          typedef asio_tls base;
-
-          typedef base::concurrency_type concurrency_type;
-
-          typedef base::request_type request_type;
-          typedef base::response_type response_type;
-
-          typedef base::message_type message_type;
-          typedef base::con_msg_manager_type con_msg_manager_type;
-          typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-          /// Custom Logging policies
-          /*typedef websocketpp::log::syslog<concurrency_type,
-              websocketpp::log::elevel> elog_type;
-          typedef websocketpp::log::syslog<concurrency_type,
-              websocketpp::log::alevel> alog_type;
-          */
-          //typedef base::alog_type alog_type;
-          //typedef base::elog_type elog_type;
-          typedef websocketpp::log::stub elog_type;
-          typedef websocketpp::log::stub alog_type;
 
-          typedef base::rng_type rng_type;
+          /// permessage_compress extension
+          struct permessage_deflate_config {};
 
-          struct transport_config : public base::transport_config {
-              typedef type::concurrency_type concurrency_type;
-              typedef type::alog_type alog_type;
-              typedef type::elog_type elog_type;
-              typedef type::request_type request_type;
-              typedef type::response_type response_type;
-              typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-          };
-
-          typedef websocketpp::transport::asio::endpoint<transport_config>
-              transport_type;
-
-          static const long timeout_open_handshake = 0;
+          typedef websocketpp::extensions::permessage_deflate::enabled
+              <permessage_deflate_config> permessage_deflate_type;
       };
       struct asio_tls_stub_log : public websocketpp::config::asio_tls {
          typedef asio_tls_stub_log type;
@@ -124,16 +90,22 @@ namespace fc { namespace http {
          typedef base::rng_type rng_type;
 
          struct transport_config : public base::transport_config {
-         typedef type::concurrency_type concurrency_type;
-         typedef type::alog_type alog_type;
-         typedef type::elog_type elog_type;
-         typedef type::request_type request_type;
-         typedef type::response_type response_type;
-         typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+            typedef type::concurrency_type concurrency_type;
+            typedef type::alog_type alog_type;
+            typedef type::elog_type elog_type;
+            typedef type::request_type request_type;
+            typedef type::response_type response_type;
+            typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
          };
 
          typedef websocketpp::transport::asio::endpoint<transport_config>
          transport_type;
+
+         /// permessage_compress extension
+         struct permessage_deflate_config {};
+
+         typedef websocketpp::extensions::permessage_deflate::enabled
+             <permessage_deflate_config> permessage_deflate_type;
       };
 
 
diff --git a/vendor/websocketpp b/vendor/websocketpp
index c5510d6..378437a 160000
--- a/vendor/websocketpp
+++ b/vendor/websocketpp
@@ -1 +1 @@
-Subproject commit c5510d6de04917812b910a8dd44735c1f17061d9
+Subproject commit 378437aecdcb1dfe62096ffd5d944bf1f640ccc3

From 21045dde5faa8fcf5f43b97c85f9df210317633b Mon Sep 17 00:00:00 2001
From: Eric Frias <efrias@syncad.com>
Date: Thu, 10 Mar 2016 17:22:28 -0500
Subject: [PATCH 003/108] Add an option to the websocket server constructor to
 allow disabling deflate compression.  Refactored the code to remove
 duplication between tls/non-tls versions of the server, which appear to have
 been cut & paste copies of one another that had diverged slightly.  This
 makes some of the fixes to the non-tls server available in the tls server.
 cryptonomex/graphene#619

---
 include/fc/network/http/websocket.hpp |  16 +-
 src/network/http/websocket.cpp        | 348 +++++++++++++-------------
 2 files changed, 183 insertions(+), 181 deletions(-)

diff --git a/include/fc/network/http/websocket.hpp b/include/fc/network/http/websocket.hpp
index c0c7266..1cb6417 100644
--- a/include/fc/network/http/websocket.hpp
+++ b/include/fc/network/http/websocket.hpp
@@ -8,8 +8,7 @@
 
 namespace fc { namespace http {
    namespace detail {
-      class websocket_server_impl;
-      class websocket_tls_server_impl;
+      class abstract_websocket_server;
       class websocket_client_impl;
       class websocket_tls_client_impl;
    } // namespace detail;
@@ -42,7 +41,7 @@ namespace fc { namespace http {
    class websocket_server
    {
       public:
-         websocket_server();
+         websocket_server(bool enable_permessage_deflate = true);
          ~websocket_server();
 
          void on_connection( const on_connection_handler& handler);
@@ -51,16 +50,16 @@ namespace fc { namespace http {
          void start_accept();
 
       private:
-         friend class detail::websocket_server_impl;
-         std::unique_ptr<detail::websocket_server_impl> my;
+         std::unique_ptr<detail::abstract_websocket_server> my;
    };
 
 
    class websocket_tls_server
    {
       public:
-         websocket_tls_server( const std::string& server_pem = std::string(),
-                           const std::string& ssl_password = std::string());
+         websocket_tls_server(const std::string& server_pem = std::string(),
+                              const std::string& ssl_password = std::string(),
+                              bool enable_permessage_deflate = true);
          ~websocket_tls_server();
 
          void on_connection( const on_connection_handler& handler);
@@ -69,8 +68,7 @@ namespace fc { namespace http {
          void start_accept();
 
       private:
-         friend class detail::websocket_tls_server_impl;
-         std::unique_ptr<detail::websocket_tls_server_impl> my;
+         std::unique_ptr<detail::abstract_websocket_server> my;
    };
 
    class websocket_client
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index c75f0e8..81a7cad 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -20,12 +20,11 @@
 namespace fc { namespace http {
 
    namespace detail {
-
       struct asio_with_stub_log : public websocketpp::config::asio {
-
           typedef asio_with_stub_log type;
           typedef asio base;
 
+          //// All boilerplate copying the base class's config, except as noted
           typedef base::concurrency_type concurrency_type;
 
           typedef base::request_type request_type;
@@ -34,15 +33,8 @@ namespace fc { namespace http {
           typedef base::message_type message_type;
           typedef base::con_msg_manager_type con_msg_manager_type;
           typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-          /// Custom Logging policies
-          /*typedef websocketpp::log::syslog<concurrency_type,
-              websocketpp::log::elevel> elog_type;
-          typedef websocketpp::log::syslog<concurrency_type,
-              websocketpp::log::alevel> alog_type;
-          */
-          //typedef base::alog_type alog_type;
-          //typedef base::elog_type elog_type;
+          
+          /// Custom Logging policies, use do-nothing log::stub instead of log::basic
           typedef websocketpp::log::stub elog_type;
           typedef websocketpp::log::stub alog_type;
 
@@ -61,60 +53,124 @@ namespace fc { namespace http {
           typedef websocketpp::transport::asio::endpoint<transport_config>
               transport_type;
 
+          // override default value of 5 sec timeout
           static const long timeout_open_handshake = 0;
+      };
+      
+      struct asio_with_stub_log_and_deflate : public websocketpp::config::asio {
+          typedef asio_with_stub_log_and_deflate type;
+          typedef asio base;
 
-          /// permessage_compress extension
-          struct permessage_deflate_config {};
+          //// All boilerplate copying the base class's config, except as noted
+          typedef base::concurrency_type concurrency_type;
+
+          typedef base::request_type request_type;
+          typedef base::response_type response_type;
+
+          typedef base::message_type message_type;
+          typedef base::con_msg_manager_type con_msg_manager_type;
+          typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+          /// Custom Logging policies, use do-nothing log::stub instead of log::basic
+          typedef websocketpp::log::stub elog_type;
+          typedef websocketpp::log::stub alog_type;
 
+          typedef base::rng_type rng_type;
+
+          struct transport_config : public base::transport_config {
+              typedef type::concurrency_type concurrency_type;
+              typedef type::alog_type alog_type;
+              typedef type::elog_type elog_type;
+              typedef type::request_type request_type;
+              typedef type::response_type response_type;
+              typedef websocketpp::transport::asio::basic_socket::endpoint
+                  socket_type;
+          };
+
+          typedef websocketpp::transport::asio::endpoint<transport_config>
+              transport_type;
+
+          /// enable the permessage_compress extension
+          struct permessage_deflate_config {};
           typedef websocketpp::extensions::permessage_deflate::enabled
               <permessage_deflate_config> permessage_deflate_type;
+
+          // override default value of 5 sec timeout
+          static const long timeout_open_handshake = 0;
       };
+
       struct asio_tls_stub_log : public websocketpp::config::asio_tls {
-         typedef asio_tls_stub_log type;
-         typedef asio_tls base;
+          typedef asio_tls_stub_log type;
+          typedef asio_tls base;
 
-         typedef base::concurrency_type concurrency_type;
+          //// All boilerplate copying the base class's config, except as noted
+          typedef base::concurrency_type concurrency_type;
 
-         typedef base::request_type request_type;
-         typedef base::response_type response_type;
+          typedef base::request_type request_type;
+          typedef base::response_type response_type;
 
-         typedef base::message_type message_type;
-         typedef base::con_msg_manager_type con_msg_manager_type;
-         typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+          typedef base::message_type message_type;
+          typedef base::con_msg_manager_type con_msg_manager_type;
+          typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
 
-         //typedef base::alog_type alog_type;
-         //typedef base::elog_type elog_type;
-         typedef websocketpp::log::stub elog_type;
-         typedef websocketpp::log::stub alog_type;
+          /// Custom Logging policies, use do-nothing log::stub instead of log::basic
+          typedef websocketpp::log::stub elog_type;
+          typedef websocketpp::log::stub alog_type;
 
-         typedef base::rng_type rng_type;
+          typedef base::rng_type rng_type;
 
-         struct transport_config : public base::transport_config {
-            typedef type::concurrency_type concurrency_type;
-            typedef type::alog_type alog_type;
-            typedef type::elog_type elog_type;
-            typedef type::request_type request_type;
-            typedef type::response_type response_type;
-            typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-         };
+          struct transport_config : public base::transport_config {
+              typedef type::concurrency_type concurrency_type;
+              typedef type::alog_type alog_type;
+              typedef type::elog_type elog_type;
+              typedef type::request_type request_type;
+              typedef type::response_type response_type;
+              typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+          };
 
-         typedef websocketpp::transport::asio::endpoint<transport_config>
-         transport_type;
+          typedef websocketpp::transport::asio::endpoint<transport_config>
+              transport_type;
+      };
 
-         /// permessage_compress extension
-         struct permessage_deflate_config {};
+      struct asio_tls_stub_log_and_deflate : public websocketpp::config::asio_tls {
+          typedef asio_tls_stub_log_and_deflate type;
+          typedef asio_tls base;
 
-         typedef websocketpp::extensions::permessage_deflate::enabled
-             <permessage_deflate_config> permessage_deflate_type;
-      };
+          //// All boilerplate copying the base class's config, except as noted
+          typedef base::concurrency_type concurrency_type;
+
+          typedef base::request_type request_type;
+          typedef base::response_type response_type;
+
+          typedef base::message_type message_type;
+          typedef base::con_msg_manager_type con_msg_manager_type;
+          typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
 
+          /// Custom Logging policies, use do-nothing log::stub instead of log::basic
+          typedef websocketpp::log::stub elog_type;
+          typedef websocketpp::log::stub alog_type;
 
+          typedef base::rng_type rng_type;
 
+          struct transport_config : public base::transport_config {
+              typedef type::concurrency_type concurrency_type;
+              typedef type::alog_type alog_type;
+              typedef type::elog_type elog_type;
+              typedef type::request_type request_type;
+              typedef type::response_type response_type;
+              typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+          };
 
+          typedef websocketpp::transport::asio::endpoint<transport_config>
+              transport_type;
+
+          /// enable the permessage_compress extension
+          struct permessage_deflate_config {};
+          typedef websocketpp::extensions::permessage_deflate::enabled
+              <permessage_deflate_config> permessage_deflate_type;
+      };
 
       using websocketpp::connection_hdl;
-      typedef websocketpp::server<asio_with_stub_log>  websocket_server_type;
-      typedef websocketpp::server<asio_tls_stub_log>   websocket_tls_server_type;
 
       template<typename T>
       class websocket_connection_impl : public websocket_connection
@@ -145,7 +201,19 @@ namespace fc { namespace http {
 
       typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
 
-      class websocket_server_impl
+      class abstract_websocket_server
+      {
+         public:
+            virtual ~abstract_websocket_server() {}
+
+            virtual void on_connection( const on_connection_handler& handler) = 0;
+            virtual void listen( uint16_t port ) = 0;
+            virtual void listen( const fc::ip::endpoint& ep ) = 0;
+            virtual void start_accept() = 0;
+      };
+
+      template <typename config>
+      class websocket_server_impl : public abstract_websocket_server
       {
          public:
             websocket_server_impl()
@@ -157,15 +225,15 @@ namespace fc { namespace http {
                _server.set_reuse_addr(true);
                _server.set_open_handler( [&]( connection_hdl hdl ){
                     _server_thread.async( [&](){
-                       auto new_con = std::make_shared<websocket_connection_impl<websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
+                       websocket_connection_ptr new_con = std::make_shared<websocket_connection_impl<typename websocketpp::server<config>::connection_ptr>>( _server.get_con_from_hdl(hdl) );
                        _on_connection( _connections[hdl] = new_con );
                     }).wait();
                });
-               _server.set_message_handler( [&]( connection_hdl hdl, websocket_server_type::message_ptr msg ){
+               _server.set_message_handler( [&]( connection_hdl hdl, typename websocketpp::server<config>::message_ptr msg ){
                     _server_thread.async( [&](){
                        auto current_con = _connections.find(hdl);
                        assert( current_con != _connections.end() );
-                       wdump(("server")(msg->get_payload()));
+                       //wdump(("server")(msg->get_payload()));
                        //std::cerr<<"recv: "<<msg->get_payload()<<"\n";
                        auto payload = msg->get_payload();
                        std::shared_ptr<websocket_connection> con = current_con->second;
@@ -178,13 +246,13 @@ namespace fc { namespace http {
 
                _server.set_http_handler( [&]( connection_hdl hdl ){
                     _server_thread.async( [&](){
-                       auto current_con = std::make_shared<websocket_connection_impl<websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
+                       auto current_con = std::make_shared<websocket_connection_impl<typename websocketpp::server<config>::connection_ptr>>( _server.get_con_from_hdl(hdl) );
                        _on_connection( current_con );
 
                        auto con = _server.get_con_from_hdl(hdl);
                        con->defer_http_response();
                        std::string request_body = con->get_request_body();
-                       wdump(("server")(request_body));
+                       //wdump(("server")(request_body));
 
                        fc::async([current_con, request_body, con] {
                           std::string response = current_con->on_http(request_body);
@@ -246,132 +314,62 @@ namespace fc { namespace http {
                if( _closed ) _closed->wait();
             }
 
+            void on_connection( const on_connection_handler& handler ) override
+            {
+               _on_connection = handler;
+            }
+
+            void listen( uint16_t port ) override
+            {
+               _server.listen(port);
+            }
+
+            void listen( const fc::ip::endpoint& ep ) override
+            {
+               _server.listen( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4(uint32_t(ep.get_address())),ep.port()) );
+            }
+
+            void start_accept() override
+            {
+               _server.start_accept();
+            }
+
             typedef std::map<connection_hdl, websocket_connection_ptr,std::owner_less<connection_hdl> > con_map;
 
             con_map                  _connections;
             fc::thread&              _server_thread;
-            websocket_server_type    _server;
+            websocketpp::server<config> _server;
             on_connection_handler    _on_connection;
             fc::promise<void>::ptr   _closed;
             uint32_t                 _pending_messages = 0;
       };
 
-      class websocket_tls_server_impl
+      template <typename config>
+      class websocket_tls_server_impl : public websocket_server_impl<config>
       {
          public:
             websocket_tls_server_impl( const string& server_pem, const string& ssl_password )
-            :_server_thread( fc::thread::current() )
             {
-               //if( server_pem.size() )
-               {
-                  _server.set_tls_init_handler( [=]( websocketpp::connection_hdl hdl ) -> context_ptr {
-                        context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
-                        try {
-                           ctx->set_options(boost::asio::ssl::context::default_workarounds |
-                           boost::asio::ssl::context::no_sslv2 |
-                           boost::asio::ssl::context::no_sslv3 |
-                           boost::asio::ssl::context::single_dh_use);
-                           ctx->set_password_callback([=](std::size_t max_length, boost::asio::ssl::context::password_purpose){ return ssl_password;});
-                           ctx->use_certificate_chain_file(server_pem);
-                           ctx->use_private_key_file(server_pem, boost::asio::ssl::context::pem);
-                        } catch (std::exception& e) {
-                           std::cout << e.what() << std::endl;
-                        }
-                        return ctx;
-                  });
-               }
-
-               _server.clear_access_channels( websocketpp::log::alevel::all );
-               _server.init_asio(&fc::asio::default_io_service());
-               _server.set_reuse_addr(true);
-               _server.set_open_handler( [&]( connection_hdl hdl ){
-                    _server_thread.async( [&](){
-                       auto new_con = std::make_shared<websocket_connection_impl<websocket_tls_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
-                       _on_connection( _connections[hdl] = new_con );
-                    }).wait();
-               });
-               _server.set_message_handler( [&]( connection_hdl hdl, websocket_server_type::message_ptr msg ){
-                    _server_thread.async( [&](){
-                       auto current_con = _connections.find(hdl);
-                       assert( current_con != _connections.end() );
-                       auto received = msg->get_payload();
-                       std::shared_ptr<websocket_connection> con = current_con->second;
-                       fc::async([con,received](){ con->on_message( received ); });
-                    }).wait();
-               });
-
-               _server.set_http_handler( [&]( connection_hdl hdl ){
-                    _server_thread.async( [&](){
-
-                       auto current_con = std::make_shared<websocket_connection_impl<websocket_tls_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
-                       try{
-                          _on_connection( current_con );
-
-                          auto con = _server.get_con_from_hdl(hdl);
-                          wdump(("server")(con->get_request_body()));
-                          auto response = current_con->on_http( con->get_request_body() );
-
-                          con->set_body( response );
-                          con->set_status( websocketpp::http::status_code::ok );
-                       } catch ( const fc::exception& e )
-                       {
-                         edump((e.to_detail_string()));
-                       }
-                       current_con->closed();
-
-                    }).wait();
+               this->_server.set_tls_init_handler( [=]( websocketpp::connection_hdl hdl ) -> context_ptr {
+                     context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
+                     try {
+                        ctx->set_options(boost::asio::ssl::context::default_workarounds |
+                        boost::asio::ssl::context::no_sslv2 |
+                        boost::asio::ssl::context::no_sslv3 |
+                        boost::asio::ssl::context::single_dh_use);
+                        ctx->set_password_callback([=](std::size_t max_length, boost::asio::ssl::context::password_purpose){ return ssl_password;});
+                        ctx->use_certificate_chain_file(server_pem);
+                        ctx->use_private_key_file(server_pem, boost::asio::ssl::context::pem);
+                     } catch (std::exception& e) {
+                        std::cout << e.what() << std::endl;
+                     }
+                     return ctx;
                });
-
-               _server.set_close_handler( [&]( connection_hdl hdl ){
-                    _server_thread.async( [&](){
-                       _connections[hdl]->closed();
-                       _connections.erase( hdl );
-                    }).wait();
-               });
-
-               _server.set_fail_handler( [&]( connection_hdl hdl ){
-                    if( _server.is_listening() )
-                    {
-                       _server_thread.async( [&](){
-                          if( _connections.find(hdl) != _connections.end() )
-                          {
-                             _connections[hdl]->closed();
-                             _connections.erase( hdl );
-                          }
-                       }).wait();
-                    }
-               });
-            }
-            ~websocket_tls_server_impl()
-            {
-               if( _server.is_listening() )
-                  _server.stop_listening();
-               auto cpy_con = _connections;
-               for( auto item : cpy_con )
-                  _server.close( item.first, 0, "server exit" );
             }
-
-            typedef std::map<connection_hdl, websocket_connection_ptr,std::owner_less<connection_hdl> > con_map;
-
-            con_map                     _connections;
-            fc::thread&                 _server_thread;
-            websocket_tls_server_type   _server;
-            on_connection_handler       _on_connection;
-            fc::promise<void>::ptr      _closed;
       };
 
 
 
-
-
-
-
-
-
-
-
-
-
       typedef websocketpp::client<asio_with_stub_log> websocket_client_type;
       typedef websocketpp::client<asio_tls_stub_log> websocket_tls_client_type;
 
@@ -514,57 +512,63 @@ namespace fc { namespace http {
 
    } // namespace detail
 
-   websocket_server::websocket_server():my( new detail::websocket_server_impl() ) {}
+   websocket_server::websocket_server(bool enable_permessage_deflate /* = true */) :
+      my( enable_permessage_deflate ? 
+            (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log_and_deflate> : 
+            (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log> ) 
+   {}
    websocket_server::~websocket_server(){}
 
    void websocket_server::on_connection( const on_connection_handler& handler )
    {
-      my->_on_connection = handler;
+      my->on_connection(handler);
    }
 
    void websocket_server::listen( uint16_t port )
    {
-      my->_server.listen(port);
+      my->listen(port);
    }
    void websocket_server::listen( const fc::ip::endpoint& ep )
    {
-      my->_server.listen( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4(uint32_t(ep.get_address())),ep.port()) );
+      my->listen(ep);
    }
 
    void websocket_server::start_accept() {
-      my->_server.start_accept();
+      my->start_accept();
    }
 
 
 
 
-   websocket_tls_server::websocket_tls_server( const string& server_pem, const string& ssl_password ):my( new detail::websocket_tls_server_impl(server_pem, ssl_password) ) {}
+   websocket_tls_server::websocket_tls_server(const string& server_pem, 
+                                              const string& ssl_password, 
+                                              bool enable_permessage_deflate /* = true */) :
+      my( enable_permessage_deflate ? 
+            (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log_and_deflate>(server_pem, ssl_password) : 
+            (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log>(server_pem, ssl_password) ) 
+   {}
    websocket_tls_server::~websocket_tls_server(){}
 
    void websocket_tls_server::on_connection( const on_connection_handler& handler )
    {
-      my->_on_connection = handler;
+      my->on_connection(handler);
    }
 
    void websocket_tls_server::listen( uint16_t port )
    {
-      my->_server.listen(port);
+      my->listen(port);
    }
    void websocket_tls_server::listen( const fc::ip::endpoint& ep )
    {
-      my->_server.listen( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4(uint32_t(ep.get_address())),ep.port()) );
+      my->listen(ep);
    }
 
-   void websocket_tls_server::start_accept() {
-      my->_server.start_accept();
+   void websocket_tls_server::start_accept() 
+   {
+      my->start_accept();
    }
 
 
-   websocket_tls_client::websocket_tls_client():my( new detail::websocket_tls_client_impl() ) {}
-   websocket_tls_client::~websocket_tls_client(){ }
-
-
-
    websocket_client::websocket_client():my( new detail::websocket_client_impl() ),smy(new detail::websocket_tls_client_impl()) {}
    websocket_client::~websocket_client(){ }
 

From eaa763aff18e0c8c52e093ae9850a216a98ab435 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Fri, 11 Mar 2016 12:33:33 -0500
Subject: [PATCH 004/108] adding canonical flag

---
 include/fc/crypto/elliptic.hpp    | 2 +-
 src/crypto/elliptic_impl_priv.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/fc/crypto/elliptic.hpp b/include/fc/crypto/elliptic.hpp
index 99cd68a..dd60da7 100644
--- a/include/fc/crypto/elliptic.hpp
+++ b/include/fc/crypto/elliptic.hpp
@@ -123,7 +123,7 @@ namespace fc {
            fc::sha512 get_shared_secret( const public_key& pub )const;
 
 //           signature         sign( const fc::sha256& digest )const;
-           compact_signature sign_compact( const fc::sha256& digest )const;
+           compact_signature sign_compact( const fc::sha256& digest, bool require_canonical = true )const;
 //           bool              verify( const fc::sha256& digest, const signature& sig );
 
            public_key get_public_key()const;
diff --git a/src/crypto/elliptic_impl_priv.cpp b/src/crypto/elliptic_impl_priv.cpp
index ad79ebe..585ffde 100644
--- a/src/crypto/elliptic_impl_priv.cpp
+++ b/src/crypto/elliptic_impl_priv.cpp
@@ -85,7 +85,7 @@ namespace fc { namespace ecc {
         return secp256k1_nonce_function_default( nonce32, msg32, key32, *extra, nullptr );
     }
 
-    compact_signature private_key::sign_compact( const fc::sha256& digest )const
+    compact_signature private_key::sign_compact( const fc::sha256& digest, bool require_canonical )const
     {
         FC_ASSERT( my->_key != empty_priv );
         compact_signature result;
@@ -94,7 +94,7 @@ namespace fc { namespace ecc {
         do
         {
             FC_ASSERT( secp256k1_ecdsa_sign_compact( detail::_get_context(), (unsigned char*) digest.data(), (unsigned char*) result.begin() + 1, (unsigned char*) my->_key.data(), extended_nonce_function, &counter, &recid ));
-        } while( !public_key::is_canonical( result ) );
+        } while( require_canonical && !public_key::is_canonical( result ) );
         result.begin()[0] = 27 + 4 + recid;
         return result;
     }

From 622ff58039f2388433272a44fe416f5b8025589a Mon Sep 17 00:00:00 2001
From: Eric Frias <efrias@syncad.com>
Date: Mon, 14 Mar 2016 18:26:29 -0400
Subject: [PATCH 005/108] Make websocket permessage-deflate default to disabled
 since it causes problems with Chrome

---
 include/fc/network/http/websocket.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/fc/network/http/websocket.hpp b/include/fc/network/http/websocket.hpp
index 1cb6417..bcb022e 100644
--- a/include/fc/network/http/websocket.hpp
+++ b/include/fc/network/http/websocket.hpp
@@ -59,7 +59,7 @@ namespace fc { namespace http {
       public:
          websocket_tls_server(const std::string& server_pem = std::string(),
                               const std::string& ssl_password = std::string(),
-                              bool enable_permessage_deflate = true);
+                              bool enable_permessage_deflate = false);
          ~websocket_tls_server();
 
          void on_connection( const on_connection_handler& handler);

From a421e280488385cab26a42153f7ce3c8d5b6281f Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Thu, 17 Mar 2016 17:24:25 -0400
Subject: [PATCH 006/108] change json seralization of map<string,T> to be
 object rather than array of pairs

---
 include/fc/variant.hpp        |  9 +++++++++
 include/fc/variant_object.hpp | 36 +++++++++++++++++++++++++++++++++++
 src/rpc/websocket_api.cpp     |  1 +
 src/variant_object.cpp        |  1 +
 vendor/websocketpp            |  2 +-
 5 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp
index 11ab95a..ebb6934 100644
--- a/include/fc/variant.hpp
+++ b/include/fc/variant.hpp
@@ -93,10 +93,17 @@ namespace fc
    template<typename K, typename T>
    void from_variant( const variant& var, fc::flat_map<K,T>& vo );
 
+   template<typename T>
+   void to_variant( const std::map<string,T>& var,  variant& vo );
+   template<typename T>
+   void from_variant( const variant& var,  std::map<string,T>& vo );
+
    template<typename K, typename T>
    void to_variant( const std::map<K,T>& var,  variant& vo );
    template<typename K, typename T>
    void from_variant( const variant& var,  std::map<K,T>& vo );
+
+
    template<typename K, typename T>
    void to_variant( const std::multimap<K,T>& var,  variant& vo );
    template<typename K, typename T>
@@ -401,6 +408,8 @@ namespace fc
          vo.insert( itr->as< std::pair<K,T> >() );
 
    }
+
+
    template<typename K, typename T>
    void to_variant( const std::map<K, T>& var,  variant& vo )
    {
diff --git a/include/fc/variant_object.hpp b/include/fc/variant_object.hpp
index 5a39c80..99b0d86 100644
--- a/include/fc/variant_object.hpp
+++ b/include/fc/variant_object.hpp
@@ -5,6 +5,7 @@
 
 namespace fc
 {
+   using std::map;
    class mutable_variant_object;
    
    /**
@@ -66,6 +67,15 @@ namespace fc
 
       /** initializes the first key/value pair in the object */
       variant_object( string key, variant val );
+
+      template<typename T>
+      variant_object( const map<string,T>& values )
+      :_key_value( new std::vector<entry>() ) {
+         _key_value->reserve( values.size() );
+         for( const auto& item : values ) {
+            _key_value->emplace_back( entry( item.first, fc::variant(item.second) ) );
+         }
+      }
        
       template<typename T>
       variant_object( string key, T&& val )
@@ -196,6 +206,15 @@ namespace fc
 
       mutable_variant_object();
 
+      template<typename T>
+      mutable_variant_object( const map<string,T>& values )
+      :_key_value( new std::vector<entry>() ) {
+         _key_value->reserve( values.size() );
+         for( const auto& item : values ) {
+            _key_value->emplace_back( variant_object::entry( item.first, fc::variant(item.second) ) );
+         }
+      }
+
       /** initializes the first key/value pair in the object */
       mutable_variant_object( string key, variant val );
       template<typename T>
@@ -212,6 +231,8 @@ namespace fc
       mutable_variant_object& operator=( mutable_variant_object&& );
       mutable_variant_object& operator=( const mutable_variant_object& );
       mutable_variant_object& operator=( const variant_object& );
+
+
    private:
       std::unique_ptr< std::vector< entry > > _key_value;
       friend class variant_object;
@@ -221,4 +242,19 @@ namespace fc
    /** @ingroup Serializable */
    void from_variant( const variant& var,  mutable_variant_object& vo );
 
+   template<typename T>
+   void to_variant( const std::map<string, T>& var,  variant& vo )
+   {
+       vo = variant_object( var );
+   }
+
+   template<typename T>
+   void from_variant( const variant& var,  std::map<string, T>& vo )
+   {
+      const auto& obj = var.get_object();
+      vo.clear();
+      for( auto itr = obj.begin(); itr != obj.end(); ++itr )
+         vo[itr->key()] = itr->value().as<T>();
+   }
+
 } // namespace fc
diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index 39381ab..df09a68 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -74,6 +74,7 @@ std::string websocket_api_connection::on_message(
    const std::string& message,
    bool send_message /* = true */ )
 {
+   wdump((message));
    try
    {
       auto var = fc::json::from_string(message);
diff --git a/src/variant_object.cpp b/src/variant_object.cpp
index 6f3b1dc..38851b0 100644
--- a/src/variant_object.cpp
+++ b/src/variant_object.cpp
@@ -163,6 +163,7 @@ namespace fc
       return *this;
    }
 
+
    void to_variant( const variant_object& var,  variant& vo )
    {
       vo = variant(var);
diff --git a/vendor/websocketpp b/vendor/websocketpp
index 378437a..c5510d6 160000
--- a/vendor/websocketpp
+++ b/vendor/websocketpp
@@ -1 +1 @@
-Subproject commit 378437aecdcb1dfe62096ffd5d944bf1f640ccc3
+Subproject commit c5510d6de04917812b910a8dd44735c1f17061d9

From ea2107d33af86819e961a17c30a6e3a10908b84a Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nathan@followmyvote.com>
Date: Thu, 17 Mar 2016 17:27:21 -0500
Subject: [PATCH 007/108] Prevent websocketpp from polluting installs

When clients of fc (such as graphene) do an install (via `make install` or similar), websocketpp was installing as well. This commit prevents this from happening.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeadd2b..53ac49f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -249,7 +249,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/git_revision.cpp.in" "${CMAKE_CU
 list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp")
 list(APPEND sources ${fc_headers})
 
-add_subdirectory( vendor/websocketpp )
+add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL )
 add_subdirectory( vendor/udt4 )
 
 setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY )

From 397c10ce1982f1c007a1efc38454ff63f85c1eed Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nathan@followmyvote.com>
Date: Thu, 17 Mar 2016 17:41:22 -0500
Subject: [PATCH 008/108] Fix installation

FC now installs properly with a `make install`
---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53ac49f..f1bcdce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -252,7 +252,8 @@ list(APPEND sources ${fc_headers})
 add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL )
 add_subdirectory( vendor/udt4 )
 
-setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY )
+setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC )
+install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include )
 
 # begin readline stuff
 find_package(Curses)

From 2bd8e92a756c4e9e3d43c6e5c2aebddaf6b7db27 Mon Sep 17 00:00:00 2001
From: Eric Frias <efrias@syncad.com>
Date: Fri, 18 Mar 2016 09:32:55 -0400
Subject: [PATCH 009/108] Windows build fixes (disable compiling
 permessage-deflate, which isn't very useful right now.  The build error will
 probably be resolved in websocketpp by the time we need it)

---
 CMakeLists.txt                 |  1 +
 src/network/http/websocket.cpp | 42 +++++++++++++++++++++++++++++-----
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeadd2b..69c4dff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,6 +316,7 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/udt4/src
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
+    ${ZLIB_INCLUDE_DIR}
   )
 
 #target_link_libraries( fc PUBLIC udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index 81a7cad..b8a3d3c 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -1,9 +1,19 @@
 #include <fc/network/http/websocket.hpp>
+
+#ifndef WIN32 
+// websocket++ currently does not build correctly with permessage deflate enabled
+// since chrome does not work with websocketpp's implementation of permessage-deflate
+// yet, I'm just disabling it on windows instead of trying to fix the build error.
+# define ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
+#endif
+
 #include <websocketpp/config/asio_client.hpp>
 #include <websocketpp/config/asio.hpp>
 #include <websocketpp/server.hpp>
 #include <websocketpp/config/asio_client.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
+# include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+#endif
 #include <websocketpp/client.hpp>
 #include <websocketpp/logger/stub.hpp>
 
@@ -56,7 +66,8 @@ namespace fc { namespace http {
           // override default value of 5 sec timeout
           static const long timeout_open_handshake = 0;
       };
-      
+
+#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
       struct asio_with_stub_log_and_deflate : public websocketpp::config::asio {
           typedef asio_with_stub_log_and_deflate type;
           typedef asio base;
@@ -98,6 +109,7 @@ namespace fc { namespace http {
           // override default value of 5 sec timeout
           static const long timeout_open_handshake = 0;
       };
+#endif ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
 
       struct asio_tls_stub_log : public websocketpp::config::asio_tls {
           typedef asio_tls_stub_log type;
@@ -132,6 +144,7 @@ namespace fc { namespace http {
               transport_type;
       };
 
+#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
       struct asio_tls_stub_log_and_deflate : public websocketpp::config::asio_tls {
           typedef asio_tls_stub_log_and_deflate type;
           typedef asio_tls base;
@@ -169,6 +182,7 @@ namespace fc { namespace http {
           typedef websocketpp::extensions::permessage_deflate::enabled
               <permessage_deflate_config> permessage_deflate_type;
       };
+#endif
 
       using websocketpp::connection_hdl;
 
@@ -513,10 +527,18 @@ namespace fc { namespace http {
    } // namespace detail
 
    websocket_server::websocket_server(bool enable_permessage_deflate /* = true */) :
-      my( enable_permessage_deflate ? 
+      my( 
+#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
+          enable_permessage_deflate ? 
             (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log_and_deflate> : 
+#endif
             (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log> ) 
-   {}
+   {
+#ifndef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
+     if (enable_permessage_deflate)
+       elog("Websocket permessage-deflate requested but not enabled during compile");
+#endif
+   }
    websocket_server::~websocket_server(){}
 
    void websocket_server::on_connection( const on_connection_handler& handler )
@@ -543,10 +565,18 @@ namespace fc { namespace http {
    websocket_tls_server::websocket_tls_server(const string& server_pem, 
                                               const string& ssl_password, 
                                               bool enable_permessage_deflate /* = true */) :
-      my( enable_permessage_deflate ? 
+      my(
+#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
+          enable_permessage_deflate ? 
             (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log_and_deflate>(server_pem, ssl_password) : 
+#endif
             (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log>(server_pem, ssl_password) ) 
-   {}
+   {
+#ifndef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
+     if (enable_permessage_deflate)
+       elog("Websocket permessage-deflate requested but not enabled during compile");
+#endif
+   }
    websocket_tls_server::~websocket_tls_server(){}
 
    void websocket_tls_server::on_connection( const on_connection_handler& handler )

From 5c1bb56177187009841cbf1b887d33d3f9968dfb Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Sun, 3 Apr 2016 23:29:50 -0400
Subject: [PATCH 010/108] Implement modular API support

- Create class `api_base` to be base class of `api<T>`, and `typedef shared_ptr<api_base> api_ptr`
- Create function `api_base::as<T>()` to allow simple downcast to `api<T>`
- Create class `any_api` to contain an API which has been returned from the remote end, but not yet cast with `as<T>`
- `to_generic()` override allowing remote API to return `api_ptr`, thus we need not know the type of the returned API at compile time
- Allow API's to be referenced by name, if we call with a string API name in the JSON the framework calls get_api_by_name on API 1 to determine the API ID
---
 include/fc/api.hpp                | 31 ++++++++++-
 include/fc/rpc/api_connection.hpp | 93 ++++++++++++++++++++++++++++++-
 src/rpc/http_api.cpp              | 15 ++++-
 src/rpc/websocket_api.cpp         | 13 ++++-
 4 files changed, 146 insertions(+), 6 deletions(-)

diff --git a/include/fc/api.hpp b/include/fc/api.hpp
index e84f50b..06414b1 100644
--- a/include/fc/api.hpp
+++ b/include/fc/api.hpp
@@ -38,8 +38,33 @@ namespace fc {
       OtherType& _source;
   };
 
+  template<typename Interface, typename Transform >
+  class api;
+
+  class api_connection;
+
+  typedef uint32_t api_id_type;
+
+  class api_base
+  {
+     public:
+        api_base() {}
+        virtual ~api_base() {}
+
+        virtual uint64_t get_handle()const = 0;
+
+        virtual api_id_type register_api( api_connection& conn )const = 0;
+
+        // defined in api_connection.hpp
+        template< typename T >
+        api<T, identity_member> as();
+  };
+  typedef std::shared_ptr< api_base > api_ptr;
+
+  class api_connection;
+
   template<typename Interface, typename Transform = identity_member >
-  class api {
+  class api : public api_base {
     public:
       typedef vtable<Interface,Transform> vtable_type;
 
@@ -58,10 +83,12 @@ namespace fc {
       }
 
       api( const api& cpy ):_vtable(cpy._vtable),_data(cpy._data) {}
+      virtual ~api() {}
 
       friend bool operator == ( const api& a, const api& b ) { return a._data == b._data && a._vtable == b._vtable;    }
       friend bool operator != ( const api& a, const api& b ) { return !(a._data == b._data && a._vtable == b._vtable); }
-      uint64_t  get_handle()const { return uint64_t(_data.get()); }
+      virtual uint64_t get_handle()const override { return uint64_t(_data.get()); }
+      virtual api_id_type register_api( api_connection& conn )const override;    // defined in api_connection.hpp
 
       vtable_type& operator*()const  { FC_ASSERT( _vtable ); return *_vtable; }
       vtable_type* operator->()const {  FC_ASSERT( _vtable ); return _vtable.get(); }
diff --git a/include/fc/rpc/api_connection.hpp b/include/fc/rpc/api_connection.hpp
index c06d2d0..44fc7c3 100644
--- a/include/fc/rpc/api_connection.hpp
+++ b/include/fc/rpc/api_connection.hpp
@@ -12,8 +12,6 @@
 
 namespace fc {
    class api_connection;
-   
-   typedef uint32_t api_id_type;
 
    namespace detail {
       template<typename Signature>
@@ -68,6 +66,33 @@ namespace fc {
          };
       }
 
+      /**
+       * If api<T> is returned from a remote method, the API is eagerly bound to api<T> of
+       * the correct type in api_visitor::from_variant().  This binding [1] needs a reference
+       * to the api_connection, which is made available to from_variant() as a parameter.
+       *
+       * However, in the case of a remote method which returns api_base which can subsequently
+       * be cast by the caller with as<T>, we need to keep track of the connection because
+       * the binding is done later (when the client code actually calls as<T>).
+       *
+       * [1] The binding actually happens in get_remote_api().
+       */
+      class any_api : public api_base
+      {
+         public:
+            any_api( api_id_type api_id, const std::shared_ptr<fc::api_connection>& con )
+               : _api_id(api_id), _api_connection(con) {}
+
+            virtual uint64_t get_handle()const override
+            {  return _api_id;    }
+
+            virtual api_id_type register_api( api_connection& conn )const override
+            {  FC_ASSERT( false ); return api_id_type(); }
+
+            api_id_type                         _api_id;
+            std::weak_ptr<fc::api_connection>   _api_connection;
+      };
+
    } // namespace detail
 
    class generic_api
@@ -151,6 +176,9 @@ namespace fc {
             template<typename Interface, typename Adaptor, typename ... Args>
             std::function<variant(const fc::variants&)> to_generic( const std::function<fc::optional<api<Interface,Adaptor>>(Args...)>& f )const;
 
+            template<typename ... Args>
+            std::function<variant(const fc::variants&)> to_generic( const std::function<fc::api_ptr(Args...)>& f )const;
+
             template<typename R, typename ... Args>
             std::function<variant(const fc::variants&)> to_generic( const std::function<R(Args...)>& f )const;
 
@@ -267,6 +295,15 @@ namespace fc {
                return con->get_remote_api<ResultInterface>( v.as_uint64() );
             }
 
+            static fc::api_ptr from_variant(
+               const variant& v,
+               fc::api_ptr* /* used for template deduction */,
+               const std::shared_ptr<fc::api_connection>&  con
+            )
+            {
+               return fc::api_ptr( new detail::any_api( v.as_uint64(), con ) );
+            }
+
             template<typename T>
             static fc::variant convert_callbacks( const std::shared_ptr<fc::api_connection>&, const T& v ) 
             { 
@@ -370,6 +407,24 @@ namespace fc {
          return variant();
       };
    }
+
+   template<typename ... Args>
+   std::function<variant(const fc::variants&)> generic_api::api_visitor::to_generic(
+                                               const std::function<fc::api_ptr(Args...)>& f )const
+   {
+      auto api_con = _api_con;
+      auto gapi = &api;
+      return [=]( const variants& args ) -> fc::variant {
+         auto con = api_con.lock();
+         FC_ASSERT( con, "not connected" );
+
+         auto api_result = gapi->call_generic( f, args.begin(), args.end() );
+         if( !api_result )
+            return variant();
+         return api_result->register_api( *con );
+      };
+   }
+
    template<typename R, typename ... Args>
    std::function<variant(const fc::variants&)> generic_api::api_visitor::to_generic( const std::function<R(Args...)>& f )const
    {
@@ -389,6 +444,40 @@ namespace fc {
       };
    }
 
+   /**
+    * It is slightly unclean tight coupling to have this method in the api class.
+    * It breaks encapsulation by requiring an api class method to have a pointer
+    * to an api_connection.  The reason this is necessary is we have a goal of being
+    * able to call register_api() on an api<T> through its base class api_base.  But
+    * register_api() must know the template parameters!
+    *
+    * The only reasonable way to achieve the goal is to implement register_api()
+    * as a method in api<T> (which obviously knows the template parameter T),
+    * then make the implementation accessible through the base class (by making
+    * it a pure virtual method in the base class which is overridden by the subclass's
+    * implementation).
+    */
+   template< typename Interface, typename Transform >
+   api_id_type api< Interface, Transform >::register_api( api_connection& conn )const
+   {
+      return conn.register_api( *this );
+   }
+
+   template< typename T >
+   api<T> api_base::as()
+   {
+      // TODO:  this method should probably be const (if it is not too hard)
+      api<T>* maybe_requested_type = dynamic_cast< api<T>* >(this);
+      if( maybe_requested_type != nullptr )
+         return *maybe_requested_type;
+
+      detail::any_api* maybe_any = dynamic_cast< detail::any_api* >(this);
+      FC_ASSERT( maybe_any != nullptr );
+      std::shared_ptr< api_connection > api_conn = maybe_any->_api_connection.lock();
+      FC_ASSERT( api_conn );
+      return api_conn->get_remote_api<T>( maybe_any->_api_id );
+   }
+
    namespace detail {
       template<typename Signature>
       template<typename... Args> 
diff --git a/src/rpc/http_api.cpp b/src/rpc/http_api.cpp
index c842369..c9a7786 100644
--- a/src/rpc/http_api.cpp
+++ b/src/rpc/http_api.cpp
@@ -11,9 +11,22 @@ http_api_connection::http_api_connection()
 {
    _rpc_state.add_method( "call", [this]( const variants& args ) -> variant
    {
+      // TODO: This logic is duplicated between http_api_connection and websocket_api_connection
+      // it should be consolidated into one place instead of copy-pasted
       FC_ASSERT( args.size() == 3 && args[2].is_array() );
+      api_id_type api_id;
+      if( args[0].is_string() )
+      {
+         variants subargs;
+         subargs.push_back( args[0] );
+         variant subresult = this->receive_call( 1, "get_api_by_name", subargs );
+         api_id = subresult.as_uint64();
+      }
+      else
+         api_id = args[0].as_uint64();
+
       return this->receive_call(
-         args[0].as_uint64(),
+         api_id,
          args[1].as_string(),
          args[2].get_array() );
    } );
diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index df09a68..60ef706 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -13,8 +13,19 @@ websocket_api_connection::websocket_api_connection( fc::http::websocket_connecti
    _rpc_state.add_method( "call", [this]( const variants& args ) -> variant
    {
       FC_ASSERT( args.size() == 3 && args[2].is_array() );
+      api_id_type api_id;
+      if( args[0].is_string() )
+      {
+         variants subargs;
+         subargs.push_back( args[0] );
+         variant subresult = this->receive_call( 1, "get_api_by_name", subargs );
+         api_id = subresult.as_uint64();
+      }
+      else
+         api_id = args[0].as_uint64();
+
       return this->receive_call(
-         args[0].as_uint64(),
+         api_id,
          args[1].as_string(),
          args[2].get_array() );
    } );

From 09975ce12bd61572fa99fad1faa19783085f3158 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Fri, 8 Apr 2016 14:18:42 -0400
Subject: [PATCH 011/108] adding IP address to http request handler

---
 include/fc/network/http/connection.hpp | 5 +++--
 src/network/http/http_connection.cpp   | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/fc/network/http/connection.hpp b/include/fc/network/http/connection.hpp
index 3c8de77..786f24d 100644
--- a/include/fc/network/http/connection.hpp
+++ b/include/fc/network/http/connection.hpp
@@ -40,11 +40,12 @@ namespace fc {
      struct request 
      {
         fc::string get_header( const fc::string& key )const;
+        fc::string              remote_endpoint;
         fc::string              method;
         fc::string              domain;
         fc::string              path;
-        std::vector<header>      headers;
-        std::vector<char>        body;
+        std::vector<header>     headers;
+        std::vector<char>       body;
      };
      
      std::vector<header> parse_urlencoded_params( const fc::string& f );
diff --git a/src/network/http/http_connection.cpp b/src/network/http/http_connection.cpp
index 309866d..59fb39b 100644
--- a/src/network/http/http_connection.cpp
+++ b/src/network/http/http_connection.cpp
@@ -134,6 +134,7 @@ fc::tcp_socket& connection::get_socket()const {
 
 http::request    connection::read_request()const {
   http::request req;
+  req.remote_endpoint = fc::variant(get_socket().remote_endpoint()).as_string();
   std::vector<char> line(1024*8);
   int s = my->read_until( line.data(), line.data()+line.size(), ' ' ); // METHOD
   req.method = line.data();

From 7906a584681188fb5c7fecb08f2f97dc5d82132e Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Tue, 19 Apr 2016 22:58:30 -0400
Subject: [PATCH 012/108] Revert "Make websocket permessage-deflate default to
 disabled since it causes problems with Chrome"

This reverts commit 622ff58039f2388433272a44fe416f5b8025589a.
---
 include/fc/network/http/websocket.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/fc/network/http/websocket.hpp b/include/fc/network/http/websocket.hpp
index bcb022e..1cb6417 100644
--- a/include/fc/network/http/websocket.hpp
+++ b/include/fc/network/http/websocket.hpp
@@ -59,7 +59,7 @@ namespace fc { namespace http {
       public:
          websocket_tls_server(const std::string& server_pem = std::string(),
                               const std::string& ssl_password = std::string(),
-                              bool enable_permessage_deflate = false);
+                              bool enable_permessage_deflate = true);
          ~websocket_tls_server();
 
          void on_connection( const on_connection_handler& handler);

From 1f02c6790f6327aa4a19558f61b881e2e15c9da6 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Tue, 19 Apr 2016 22:58:37 -0400
Subject: [PATCH 013/108] Revert "Add an option to the websocket server
 constructor to allow disabling deflate"

This reverts commit 21045dde5faa8fcf5f43b97c85f9df210317633b.
---
 include/fc/network/http/websocket.hpp |  16 +-
 src/network/http/websocket.cpp        | 348 +++++++++++++-------------
 2 files changed, 181 insertions(+), 183 deletions(-)

diff --git a/include/fc/network/http/websocket.hpp b/include/fc/network/http/websocket.hpp
index 1cb6417..c0c7266 100644
--- a/include/fc/network/http/websocket.hpp
+++ b/include/fc/network/http/websocket.hpp
@@ -8,7 +8,8 @@
 
 namespace fc { namespace http {
    namespace detail {
-      class abstract_websocket_server;
+      class websocket_server_impl;
+      class websocket_tls_server_impl;
       class websocket_client_impl;
       class websocket_tls_client_impl;
    } // namespace detail;
@@ -41,7 +42,7 @@ namespace fc { namespace http {
    class websocket_server
    {
       public:
-         websocket_server(bool enable_permessage_deflate = true);
+         websocket_server();
          ~websocket_server();
 
          void on_connection( const on_connection_handler& handler);
@@ -50,16 +51,16 @@ namespace fc { namespace http {
          void start_accept();
 
       private:
-         std::unique_ptr<detail::abstract_websocket_server> my;
+         friend class detail::websocket_server_impl;
+         std::unique_ptr<detail::websocket_server_impl> my;
    };
 
 
    class websocket_tls_server
    {
       public:
-         websocket_tls_server(const std::string& server_pem = std::string(),
-                              const std::string& ssl_password = std::string(),
-                              bool enable_permessage_deflate = true);
+         websocket_tls_server( const std::string& server_pem = std::string(),
+                           const std::string& ssl_password = std::string());
          ~websocket_tls_server();
 
          void on_connection( const on_connection_handler& handler);
@@ -68,7 +69,8 @@ namespace fc { namespace http {
          void start_accept();
 
       private:
-         std::unique_ptr<detail::abstract_websocket_server> my;
+         friend class detail::websocket_tls_server_impl;
+         std::unique_ptr<detail::websocket_tls_server_impl> my;
    };
 
    class websocket_client
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index 81a7cad..c75f0e8 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -20,11 +20,12 @@
 namespace fc { namespace http {
 
    namespace detail {
+
       struct asio_with_stub_log : public websocketpp::config::asio {
+
           typedef asio_with_stub_log type;
           typedef asio base;
 
-          //// All boilerplate copying the base class's config, except as noted
           typedef base::concurrency_type concurrency_type;
 
           typedef base::request_type request_type;
@@ -33,8 +34,15 @@ namespace fc { namespace http {
           typedef base::message_type message_type;
           typedef base::con_msg_manager_type con_msg_manager_type;
           typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-          
-          /// Custom Logging policies, use do-nothing log::stub instead of log::basic
+
+          /// Custom Logging policies
+          /*typedef websocketpp::log::syslog<concurrency_type,
+              websocketpp::log::elevel> elog_type;
+          typedef websocketpp::log::syslog<concurrency_type,
+              websocketpp::log::alevel> alog_type;
+          */
+          //typedef base::alog_type alog_type;
+          //typedef base::elog_type elog_type;
           typedef websocketpp::log::stub elog_type;
           typedef websocketpp::log::stub alog_type;
 
@@ -53,124 +61,60 @@ namespace fc { namespace http {
           typedef websocketpp::transport::asio::endpoint<transport_config>
               transport_type;
 
-          // override default value of 5 sec timeout
           static const long timeout_open_handshake = 0;
-      };
-      
-      struct asio_with_stub_log_and_deflate : public websocketpp::config::asio {
-          typedef asio_with_stub_log_and_deflate type;
-          typedef asio base;
-
-          //// All boilerplate copying the base class's config, except as noted
-          typedef base::concurrency_type concurrency_type;
-
-          typedef base::request_type request_type;
-          typedef base::response_type response_type;
-
-          typedef base::message_type message_type;
-          typedef base::con_msg_manager_type con_msg_manager_type;
-          typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-          /// Custom Logging policies, use do-nothing log::stub instead of log::basic
-          typedef websocketpp::log::stub elog_type;
-          typedef websocketpp::log::stub alog_type;
 
-          typedef base::rng_type rng_type;
-
-          struct transport_config : public base::transport_config {
-              typedef type::concurrency_type concurrency_type;
-              typedef type::alog_type alog_type;
-              typedef type::elog_type elog_type;
-              typedef type::request_type request_type;
-              typedef type::response_type response_type;
-              typedef websocketpp::transport::asio::basic_socket::endpoint
-                  socket_type;
-          };
-
-          typedef websocketpp::transport::asio::endpoint<transport_config>
-              transport_type;
-
-          /// enable the permessage_compress extension
+          /// permessage_compress extension
           struct permessage_deflate_config {};
+
           typedef websocketpp::extensions::permessage_deflate::enabled
               <permessage_deflate_config> permessage_deflate_type;
-
-          // override default value of 5 sec timeout
-          static const long timeout_open_handshake = 0;
       };
-
       struct asio_tls_stub_log : public websocketpp::config::asio_tls {
-          typedef asio_tls_stub_log type;
-          typedef asio_tls base;
+         typedef asio_tls_stub_log type;
+         typedef asio_tls base;
 
-          //// All boilerplate copying the base class's config, except as noted
-          typedef base::concurrency_type concurrency_type;
+         typedef base::concurrency_type concurrency_type;
 
-          typedef base::request_type request_type;
-          typedef base::response_type response_type;
+         typedef base::request_type request_type;
+         typedef base::response_type response_type;
 
-          typedef base::message_type message_type;
-          typedef base::con_msg_manager_type con_msg_manager_type;
-          typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+         typedef base::message_type message_type;
+         typedef base::con_msg_manager_type con_msg_manager_type;
+         typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
 
-          /// Custom Logging policies, use do-nothing log::stub instead of log::basic
-          typedef websocketpp::log::stub elog_type;
-          typedef websocketpp::log::stub alog_type;
+         //typedef base::alog_type alog_type;
+         //typedef base::elog_type elog_type;
+         typedef websocketpp::log::stub elog_type;
+         typedef websocketpp::log::stub alog_type;
 
-          typedef base::rng_type rng_type;
+         typedef base::rng_type rng_type;
 
-          struct transport_config : public base::transport_config {
-              typedef type::concurrency_type concurrency_type;
-              typedef type::alog_type alog_type;
-              typedef type::elog_type elog_type;
-              typedef type::request_type request_type;
-              typedef type::response_type response_type;
-              typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-          };
+         struct transport_config : public base::transport_config {
+            typedef type::concurrency_type concurrency_type;
+            typedef type::alog_type alog_type;
+            typedef type::elog_type elog_type;
+            typedef type::request_type request_type;
+            typedef type::response_type response_type;
+            typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+         };
 
-          typedef websocketpp::transport::asio::endpoint<transport_config>
-              transport_type;
-      };
-
-      struct asio_tls_stub_log_and_deflate : public websocketpp::config::asio_tls {
-          typedef asio_tls_stub_log_and_deflate type;
-          typedef asio_tls base;
-
-          //// All boilerplate copying the base class's config, except as noted
-          typedef base::concurrency_type concurrency_type;
-
-          typedef base::request_type request_type;
-          typedef base::response_type response_type;
+         typedef websocketpp::transport::asio::endpoint<transport_config>
+         transport_type;
 
-          typedef base::message_type message_type;
-          typedef base::con_msg_manager_type con_msg_manager_type;
-          typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+         /// permessage_compress extension
+         struct permessage_deflate_config {};
 
-          /// Custom Logging policies, use do-nothing log::stub instead of log::basic
-          typedef websocketpp::log::stub elog_type;
-          typedef websocketpp::log::stub alog_type;
+         typedef websocketpp::extensions::permessage_deflate::enabled
+             <permessage_deflate_config> permessage_deflate_type;
+      };
 
-          typedef base::rng_type rng_type;
 
-          struct transport_config : public base::transport_config {
-              typedef type::concurrency_type concurrency_type;
-              typedef type::alog_type alog_type;
-              typedef type::elog_type elog_type;
-              typedef type::request_type request_type;
-              typedef type::response_type response_type;
-              typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
-          };
 
-          typedef websocketpp::transport::asio::endpoint<transport_config>
-              transport_type;
 
-          /// enable the permessage_compress extension
-          struct permessage_deflate_config {};
-          typedef websocketpp::extensions::permessage_deflate::enabled
-              <permessage_deflate_config> permessage_deflate_type;
-      };
 
       using websocketpp::connection_hdl;
+      typedef websocketpp::server<asio_with_stub_log>  websocket_server_type;
+      typedef websocketpp::server<asio_tls_stub_log>   websocket_tls_server_type;
 
       template<typename T>
       class websocket_connection_impl : public websocket_connection
@@ -201,19 +145,7 @@ namespace fc { namespace http {
 
       typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
 
-      class abstract_websocket_server
-      {
-         public:
-            virtual ~abstract_websocket_server() {}
-
-            virtual void on_connection( const on_connection_handler& handler) = 0;
-            virtual void listen( uint16_t port ) = 0;
-            virtual void listen( const fc::ip::endpoint& ep ) = 0;
-            virtual void start_accept() = 0;
-      };
-
-      template <typename config>
-      class websocket_server_impl : public abstract_websocket_server
+      class websocket_server_impl
       {
          public:
             websocket_server_impl()
@@ -225,15 +157,15 @@ namespace fc { namespace http {
                _server.set_reuse_addr(true);
                _server.set_open_handler( [&]( connection_hdl hdl ){
                     _server_thread.async( [&](){
-                       websocket_connection_ptr new_con = std::make_shared<websocket_connection_impl<typename websocketpp::server<config>::connection_ptr>>( _server.get_con_from_hdl(hdl) );
+                       auto new_con = std::make_shared<websocket_connection_impl<websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
                        _on_connection( _connections[hdl] = new_con );
                     }).wait();
                });
-               _server.set_message_handler( [&]( connection_hdl hdl, typename websocketpp::server<config>::message_ptr msg ){
+               _server.set_message_handler( [&]( connection_hdl hdl, websocket_server_type::message_ptr msg ){
                     _server_thread.async( [&](){
                        auto current_con = _connections.find(hdl);
                        assert( current_con != _connections.end() );
-                       //wdump(("server")(msg->get_payload()));
+                       wdump(("server")(msg->get_payload()));
                        //std::cerr<<"recv: "<<msg->get_payload()<<"\n";
                        auto payload = msg->get_payload();
                        std::shared_ptr<websocket_connection> con = current_con->second;
@@ -246,13 +178,13 @@ namespace fc { namespace http {
 
                _server.set_http_handler( [&]( connection_hdl hdl ){
                     _server_thread.async( [&](){
-                       auto current_con = std::make_shared<websocket_connection_impl<typename websocketpp::server<config>::connection_ptr>>( _server.get_con_from_hdl(hdl) );
+                       auto current_con = std::make_shared<websocket_connection_impl<websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
                        _on_connection( current_con );
 
                        auto con = _server.get_con_from_hdl(hdl);
                        con->defer_http_response();
                        std::string request_body = con->get_request_body();
-                       //wdump(("server")(request_body));
+                       wdump(("server")(request_body));
 
                        fc::async([current_con, request_body, con] {
                           std::string response = current_con->on_http(request_body);
@@ -314,62 +246,132 @@ namespace fc { namespace http {
                if( _closed ) _closed->wait();
             }
 
-            void on_connection( const on_connection_handler& handler ) override
-            {
-               _on_connection = handler;
-            }
-
-            void listen( uint16_t port ) override
-            {
-               _server.listen(port);
-            }
-
-            void listen( const fc::ip::endpoint& ep ) override
-            {
-               _server.listen( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4(uint32_t(ep.get_address())),ep.port()) );
-            }
-
-            void start_accept() override
-            {
-               _server.start_accept();
-            }
-
             typedef std::map<connection_hdl, websocket_connection_ptr,std::owner_less<connection_hdl> > con_map;
 
             con_map                  _connections;
             fc::thread&              _server_thread;
-            websocketpp::server<config> _server;
+            websocket_server_type    _server;
             on_connection_handler    _on_connection;
             fc::promise<void>::ptr   _closed;
             uint32_t                 _pending_messages = 0;
       };
 
-      template <typename config>
-      class websocket_tls_server_impl : public websocket_server_impl<config>
+      class websocket_tls_server_impl
       {
          public:
             websocket_tls_server_impl( const string& server_pem, const string& ssl_password )
+            :_server_thread( fc::thread::current() )
             {
-               this->_server.set_tls_init_handler( [=]( websocketpp::connection_hdl hdl ) -> context_ptr {
-                     context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
-                     try {
-                        ctx->set_options(boost::asio::ssl::context::default_workarounds |
-                        boost::asio::ssl::context::no_sslv2 |
-                        boost::asio::ssl::context::no_sslv3 |
-                        boost::asio::ssl::context::single_dh_use);
-                        ctx->set_password_callback([=](std::size_t max_length, boost::asio::ssl::context::password_purpose){ return ssl_password;});
-                        ctx->use_certificate_chain_file(server_pem);
-                        ctx->use_private_key_file(server_pem, boost::asio::ssl::context::pem);
-                     } catch (std::exception& e) {
-                        std::cout << e.what() << std::endl;
-                     }
-                     return ctx;
+               //if( server_pem.size() )
+               {
+                  _server.set_tls_init_handler( [=]( websocketpp::connection_hdl hdl ) -> context_ptr {
+                        context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
+                        try {
+                           ctx->set_options(boost::asio::ssl::context::default_workarounds |
+                           boost::asio::ssl::context::no_sslv2 |
+                           boost::asio::ssl::context::no_sslv3 |
+                           boost::asio::ssl::context::single_dh_use);
+                           ctx->set_password_callback([=](std::size_t max_length, boost::asio::ssl::context::password_purpose){ return ssl_password;});
+                           ctx->use_certificate_chain_file(server_pem);
+                           ctx->use_private_key_file(server_pem, boost::asio::ssl::context::pem);
+                        } catch (std::exception& e) {
+                           std::cout << e.what() << std::endl;
+                        }
+                        return ctx;
+                  });
+               }
+
+               _server.clear_access_channels( websocketpp::log::alevel::all );
+               _server.init_asio(&fc::asio::default_io_service());
+               _server.set_reuse_addr(true);
+               _server.set_open_handler( [&]( connection_hdl hdl ){
+                    _server_thread.async( [&](){
+                       auto new_con = std::make_shared<websocket_connection_impl<websocket_tls_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
+                       _on_connection( _connections[hdl] = new_con );
+                    }).wait();
+               });
+               _server.set_message_handler( [&]( connection_hdl hdl, websocket_server_type::message_ptr msg ){
+                    _server_thread.async( [&](){
+                       auto current_con = _connections.find(hdl);
+                       assert( current_con != _connections.end() );
+                       auto received = msg->get_payload();
+                       std::shared_ptr<websocket_connection> con = current_con->second;
+                       fc::async([con,received](){ con->on_message( received ); });
+                    }).wait();
+               });
+
+               _server.set_http_handler( [&]( connection_hdl hdl ){
+                    _server_thread.async( [&](){
+
+                       auto current_con = std::make_shared<websocket_connection_impl<websocket_tls_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );
+                       try{
+                          _on_connection( current_con );
+
+                          auto con = _server.get_con_from_hdl(hdl);
+                          wdump(("server")(con->get_request_body()));
+                          auto response = current_con->on_http( con->get_request_body() );
+
+                          con->set_body( response );
+                          con->set_status( websocketpp::http::status_code::ok );
+                       } catch ( const fc::exception& e )
+                       {
+                         edump((e.to_detail_string()));
+                       }
+                       current_con->closed();
+
+                    }).wait();
                });
+
+               _server.set_close_handler( [&]( connection_hdl hdl ){
+                    _server_thread.async( [&](){
+                       _connections[hdl]->closed();
+                       _connections.erase( hdl );
+                    }).wait();
+               });
+
+               _server.set_fail_handler( [&]( connection_hdl hdl ){
+                    if( _server.is_listening() )
+                    {
+                       _server_thread.async( [&](){
+                          if( _connections.find(hdl) != _connections.end() )
+                          {
+                             _connections[hdl]->closed();
+                             _connections.erase( hdl );
+                          }
+                       }).wait();
+                    }
+               });
+            }
+            ~websocket_tls_server_impl()
+            {
+               if( _server.is_listening() )
+                  _server.stop_listening();
+               auto cpy_con = _connections;
+               for( auto item : cpy_con )
+                  _server.close( item.first, 0, "server exit" );
             }
+
+            typedef std::map<connection_hdl, websocket_connection_ptr,std::owner_less<connection_hdl> > con_map;
+
+            con_map                     _connections;
+            fc::thread&                 _server_thread;
+            websocket_tls_server_type   _server;
+            on_connection_handler       _on_connection;
+            fc::promise<void>::ptr      _closed;
       };
 
 
 
+
+
+
+
+
+
+
+
+
+
       typedef websocketpp::client<asio_with_stub_log> websocket_client_type;
       typedef websocketpp::client<asio_tls_stub_log> websocket_tls_client_type;
 
@@ -512,63 +514,57 @@ namespace fc { namespace http {
 
    } // namespace detail
 
-   websocket_server::websocket_server(bool enable_permessage_deflate /* = true */) :
-      my( enable_permessage_deflate ? 
-            (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log_and_deflate> : 
-            (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log> ) 
-   {}
+   websocket_server::websocket_server():my( new detail::websocket_server_impl() ) {}
    websocket_server::~websocket_server(){}
 
    void websocket_server::on_connection( const on_connection_handler& handler )
    {
-      my->on_connection(handler);
+      my->_on_connection = handler;
    }
 
    void websocket_server::listen( uint16_t port )
    {
-      my->listen(port);
+      my->_server.listen(port);
    }
    void websocket_server::listen( const fc::ip::endpoint& ep )
    {
-      my->listen(ep);
+      my->_server.listen( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4(uint32_t(ep.get_address())),ep.port()) );
    }
 
    void websocket_server::start_accept() {
-      my->start_accept();
+      my->_server.start_accept();
    }
 
 
 
 
-   websocket_tls_server::websocket_tls_server(const string& server_pem, 
-                                              const string& ssl_password, 
-                                              bool enable_permessage_deflate /* = true */) :
-      my( enable_permessage_deflate ? 
-            (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log_and_deflate>(server_pem, ssl_password) : 
-            (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log>(server_pem, ssl_password) ) 
-   {}
+   websocket_tls_server::websocket_tls_server( const string& server_pem, const string& ssl_password ):my( new detail::websocket_tls_server_impl(server_pem, ssl_password) ) {}
    websocket_tls_server::~websocket_tls_server(){}
 
    void websocket_tls_server::on_connection( const on_connection_handler& handler )
    {
-      my->on_connection(handler);
+      my->_on_connection = handler;
    }
 
    void websocket_tls_server::listen( uint16_t port )
    {
-      my->listen(port);
+      my->_server.listen(port);
    }
    void websocket_tls_server::listen( const fc::ip::endpoint& ep )
    {
-      my->listen(ep);
+      my->_server.listen( boost::asio::ip::tcp::endpoint( boost::asio::ip::address_v4(uint32_t(ep.get_address())),ep.port()) );
    }
 
-   void websocket_tls_server::start_accept() 
-   {
-      my->start_accept();
+   void websocket_tls_server::start_accept() {
+      my->_server.start_accept();
    }
 
 
+   websocket_tls_client::websocket_tls_client():my( new detail::websocket_tls_client_impl() ) {}
+   websocket_tls_client::~websocket_tls_client(){ }
+
+
+
    websocket_client::websocket_client():my( new detail::websocket_client_impl() ),smy(new detail::websocket_tls_client_impl()) {}
    websocket_client::~websocket_client(){ }
 

From 56e36bed8f4f445e9e5d95903e576c8a4d5e93a0 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Tue, 19 Apr 2016 22:58:39 -0400
Subject: [PATCH 014/108] Revert "Update the websocketpp library and change the
 configuration options we pass"

This reverts commit d5370fc2ea436fa4340cda01af98c7993fbc67d5.
---
 CMakeLists.txt                 | 19 +++++------
 src/network/http/websocket.cpp | 62 ++++++++++++++++++++++++----------
 2 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eeadd2b..9931b9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,17 +142,6 @@ find_package(OpenSSL REQUIRED)
 
 set( CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_LIB_SUFFIXES} )
 
-# We are now building in support for deflate compression into our websockets layer by default,
-# which requires zlib.  Aside from that, all of fc compiles without zlib, so this could be
-# made optional without much effort
-# (important exception, apple: as of 10.10 yosemite, the OpenSSL static libraries shipped with 
-# os x have a dependency on zlib)
-# On a side note, fc's fc::zlib_compress() function uses a separate implementation of zlib
-# from the miniz library.  If we're comfortable requiring an external zlib, we can 
-# reimplement fc::zlib_compress() to call the real zlib, and remove miniz.c from our
-# repository.
-find_package( ZLIB REQUIRED )
-
 option( UNITY_BUILD OFF )
 
 set( fc_sources
@@ -484,6 +473,14 @@ if(WIN32)
 
 endif(WIN32)
 
+IF(APPLE)
+  # As of 10.10 yosemite, the OpenSSL static libraries shipped with os x have a dependency
+  # on zlib, so any time you link in openssl you also need to link zlib.  .  We really want to detect whether openssl was configured with the --no-zlib
+  # option or not when it was built, but that's difficult to do in practice, so we
+  # just always try to link it in on mac.
+  find_package( ZLIB REQUIRED )
+ENDIF(APPLE)
+
 SET(OPENSSL_CONF_TARGET )
 IF(DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   SET (OPENSSL_CONF_TARGET ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index c75f0e8..67745d9 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -3,7 +3,6 @@
 #include <websocketpp/config/asio.hpp>
 #include <websocketpp/server.hpp>
 #include <websocketpp/config/asio_client.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
 #include <websocketpp/client.hpp>
 #include <websocketpp/logger/stub.hpp>
 
@@ -62,12 +61,47 @@ namespace fc { namespace http {
               transport_type;
 
           static const long timeout_open_handshake = 0;
+      };
+      struct asio_tls_with_stub_log : public websocketpp::config::asio_tls {
+
+          typedef asio_with_stub_log type;
+          typedef asio_tls base;
+
+          typedef base::concurrency_type concurrency_type;
+
+          typedef base::request_type request_type;
+          typedef base::response_type response_type;
+
+          typedef base::message_type message_type;
+          typedef base::con_msg_manager_type con_msg_manager_type;
+          typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+          /// Custom Logging policies
+          /*typedef websocketpp::log::syslog<concurrency_type,
+              websocketpp::log::elevel> elog_type;
+          typedef websocketpp::log::syslog<concurrency_type,
+              websocketpp::log::alevel> alog_type;
+          */
+          //typedef base::alog_type alog_type;
+          //typedef base::elog_type elog_type;
+          typedef websocketpp::log::stub elog_type;
+          typedef websocketpp::log::stub alog_type;
 
-          /// permessage_compress extension
-          struct permessage_deflate_config {};
+          typedef base::rng_type rng_type;
 
-          typedef websocketpp::extensions::permessage_deflate::enabled
-              <permessage_deflate_config> permessage_deflate_type;
+          struct transport_config : public base::transport_config {
+              typedef type::concurrency_type concurrency_type;
+              typedef type::alog_type alog_type;
+              typedef type::elog_type elog_type;
+              typedef type::request_type request_type;
+              typedef type::response_type response_type;
+              typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+          };
+
+          typedef websocketpp::transport::asio::endpoint<transport_config>
+              transport_type;
+
+          static const long timeout_open_handshake = 0;
       };
       struct asio_tls_stub_log : public websocketpp::config::asio_tls {
          typedef asio_tls_stub_log type;
@@ -90,22 +124,16 @@ namespace fc { namespace http {
          typedef base::rng_type rng_type;
 
          struct transport_config : public base::transport_config {
-            typedef type::concurrency_type concurrency_type;
-            typedef type::alog_type alog_type;
-            typedef type::elog_type elog_type;
-            typedef type::request_type request_type;
-            typedef type::response_type response_type;
-            typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+         typedef type::concurrency_type concurrency_type;
+         typedef type::alog_type alog_type;
+         typedef type::elog_type elog_type;
+         typedef type::request_type request_type;
+         typedef type::response_type response_type;
+         typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
          };
 
          typedef websocketpp::transport::asio::endpoint<transport_config>
          transport_type;
-
-         /// permessage_compress extension
-         struct permessage_deflate_config {};
-
-         typedef websocketpp::extensions::permessage_deflate::enabled
-             <permessage_deflate_config> permessage_deflate_type;
       };
 
 

From b6fdcdd5dd50618f110b01a9c508acfbd41641cc Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Thu, 5 May 2016 13:02:54 -0400
Subject: [PATCH 015/108] json_relaxed.hpp:  Fix bug in triple quote string
 parsing

---
 include/fc/io/json_relaxed.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/fc/io/json_relaxed.hpp b/include/fc/io/json_relaxed.hpp
index a3793a4..e4876f2 100644
--- a/include/fc/io/json_relaxed.hpp
+++ b/include/fc/io/json_relaxed.hpp
@@ -123,6 +123,7 @@ namespace fc { namespace json_relaxed
                            char c2 = in.peek();
                            if( c2 == q )
                            {
+                               in.get();
                                char c3 = in.peek();
                                if( c3 == q )
                                {

From 44ede99409e891d06e5d80eb401b10d002473e77 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Wed, 18 May 2016 13:28:52 -0400
Subject: [PATCH 016/108] websocket.cpp:  Allow specifying CA root in
 websocket_client constructor

---
 include/fc/network/http/websocket.hpp |  4 +-
 src/network/http/websocket.cpp        | 53 +++++++++++++++++++++++++--
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/include/fc/network/http/websocket.hpp b/include/fc/network/http/websocket.hpp
index c0c7266..210211e 100644
--- a/include/fc/network/http/websocket.hpp
+++ b/include/fc/network/http/websocket.hpp
@@ -76,7 +76,7 @@ namespace fc { namespace http {
    class websocket_client
    {
       public:
-         websocket_client();
+         websocket_client( const std::string& ca_filename = "_default" );
          ~websocket_client();
 
          websocket_connection_ptr connect( const std::string& uri );
@@ -88,7 +88,7 @@ namespace fc { namespace http {
    class websocket_tls_client
    {
       public:
-         websocket_tls_client();
+         websocket_tls_client( const std::string& ca_filename = "_default" );
          ~websocket_tls_client();
 
          websocket_connection_ptr connect( const std::string& uri );
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index 67745d9..594fc3a 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -457,6 +457,7 @@ namespace fc { namespace http {
             fc::thread&                        _client_thread;
             websocket_client_type              _client;
             websocket_connection_ptr           _connection;
+            std::string                        _uri;
       };
 
 
@@ -466,9 +467,13 @@ namespace fc { namespace http {
          public:
             typedef websocket_tls_client_type::message_ptr message_ptr;
 
-            websocket_tls_client_impl()
+            websocket_tls_client_impl( const std::string& ca_filename )
             :_client_thread( fc::thread::current() )
             {
+                // ca_filename has special values:
+                // "_none" disables cert checking (potentially insecure!)
+                // "_default" uses default CA's provided by OS
+
                 _client.clear_access_channels( websocketpp::log::alevel::all );
                 _client.set_message_handler( [&]( connection_hdl hdl, message_ptr msg ){
                    _client_thread.async( [&](){
@@ -505,6 +510,22 @@ namespace fc { namespace http {
                        _closed->set_value();
                 });
 
+                //
+                // We need ca_filename to be copied into the closure, as the referenced object might be destroyed by the caller by the time
+                // tls_init_handler() is called.  According to [1], capture-by-value results in the desired behavior (i.e. creation of
+                // a copy which is stored in the closure) on standards compliant compilers, but some compilers on some optimization levels
+                // are buggy and are not standards compliant in this situation.  Also, keep in mind this is the opinion of a single forum
+                // poster and might be wrong.
+                //
+                // To be safe, the following line explicitly creates a non-reference string which is captured by value, which should have the
+                // correct behavior on all compilers.
+                //
+                // [1] http://www.cplusplus.com/forum/general/142165/
+                // [2] http://stackoverflow.com/questions/21443023/capturing-a-reference-by-reference-in-a-c11-lambda
+                //
+
+                std::string ca_filename_copy = ca_filename;
+
                 _client.set_tls_init_handler( [=](websocketpp::connection_hdl) {
                    context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
                    try {
@@ -512,6 +533,8 @@ namespace fc { namespace http {
                       boost::asio::ssl::context::no_sslv2 |
                       boost::asio::ssl::context::no_sslv3 |
                       boost::asio::ssl::context::single_dh_use);
+
+                      setup_peer_verify( ctx, ca_filename_copy );
                    } catch (std::exception& e) {
                       edump((e.what()));
                       std::cout << e.what() << std::endl;
@@ -531,12 +554,32 @@ namespace fc { namespace http {
                   _closed->wait();
                }
             }
+
+            std::string get_host()const
+            {
+               return websocketpp::uri( _uri ).get_host();
+            }
+
+            void setup_peer_verify( context_ptr& ctx, const std::string& ca_filename )
+            {
+               if( ca_filename == "_none" )
+                  return;
+               ctx->set_verify_mode( boost::asio::ssl::verify_peer );
+               if( ca_filename == "_default" )
+                  ctx->set_default_verify_paths();
+               else
+                  ctx->load_verify_file( ca_filename );
+               ctx->set_verify_depth(10);
+               ctx->set_verify_callback( boost::asio::ssl::rfc2818_verification( get_host() ) );
+            }
+
             bool                               _shutting_down = false;
             fc::promise<void>::ptr             _connected;
             fc::promise<void>::ptr             _closed;
             fc::thread&                        _client_thread;
-            websocket_tls_client_type              _client;
+            websocket_tls_client_type          _client;
             websocket_connection_ptr           _connection;
+            std::string                        _uri;
       };
 
 
@@ -588,12 +631,12 @@ namespace fc { namespace http {
    }
 
 
-   websocket_tls_client::websocket_tls_client():my( new detail::websocket_tls_client_impl() ) {}
+   websocket_tls_client::websocket_tls_client( const std::string& ca_filename ):my( new detail::websocket_tls_client_impl( ca_filename ) ) {}
    websocket_tls_client::~websocket_tls_client(){ }
 
 
 
-   websocket_client::websocket_client():my( new detail::websocket_client_impl() ),smy(new detail::websocket_tls_client_impl()) {}
+   websocket_client::websocket_client( const std::string& ca_filename ):my( new detail::websocket_client_impl() ),smy(new detail::websocket_tls_client_impl( ca_filename )) {}
    websocket_client::~websocket_client(){ }
 
    websocket_connection_ptr websocket_client::connect( const std::string& uri )
@@ -605,6 +648,7 @@ namespace fc { namespace http {
        // wlog( "connecting to ${uri}", ("uri",uri));
        websocketpp::lib::error_code ec;
 
+       my->_uri = uri;
        my->_connected = fc::promise<void>::ptr( new fc::promise<void>("websocket::connect") );
 
        my->_client.set_open_handler( [=]( websocketpp::connection_hdl hdl ){
@@ -631,6 +675,7 @@ namespace fc { namespace http {
        // wlog( "connecting to ${uri}", ("uri",uri));
        websocketpp::lib::error_code ec;
 
+       smy->_uri = uri;
        smy->_connected = fc::promise<void>::ptr( new fc::promise<void>("websocket::connect") );
 
        smy->_client.set_open_handler( [=]( websocketpp::connection_hdl hdl ){

From 66d4b0841dfcb907048b9a6790889c68c689abc8 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Sun, 22 May 2016 01:33:19 -0400
Subject: [PATCH 017/108] Changes to fc to get MinGW cross-compilation working

---
 .gitmodules                       |  3 +++
 CMakeLists.txt                    | 32 +++++++++++++++++++++----------
 src/byteswap.hpp                  |  2 +-
 src/compress/miniz.c              |  2 +-
 src/crypto/aes.cpp                |  6 +++---
 src/crypto/city.cpp               |  2 +-
 src/crypto/elliptic_common.cpp    |  2 +-
 src/crypto/elliptic_secp256k1.cpp |  2 +-
 src/filesystem.cpp                |  8 ++++----
 src/network/tcp_socket.cpp        |  2 +-
 src/thread/thread.cpp             |  2 +-
 vendor/udt4/CMakeLists.txt        |  2 +-
 12 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index c49f87b..22610c4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "vendor/websocketpp"]
     path = vendor/websocketpp
     url = https://github.com/zaphoyd/websocketpp.git
+[submodule "vendor/diff-match-patch-cpp-stl"]
+	path = vendor/diff-match-patch-cpp-stl
+	url = https://github.com/leutloff/diff-match-patch-cpp-stl
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9931b9a..f8d9e2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,7 @@ endif ( WIN32 )
 IF( WIN32 )
   MESSAGE(STATUS "Configuring fc to build on Win32")
 
-  set( RPCRT4 Rpcrt4 )
+  set( RPCRT4 rpcrt4 )
 
   #boost
   SET(BOOST_ROOT $ENV{BOOST_ROOT})
@@ -110,7 +110,7 @@ IF( WIN32 )
     SET(Boost_LIBRARIES ${BOOST_LIBRARIES_TEMP} ${Boost_LIBRARIES})
   ENDIF()
 
-  set( PLATFORM_SPECIFIC_LIBS WS2_32.lib Userenv.lib)
+  set( PLATFORM_SPECIFIC_LIBS wsock32.lib ws2_32.lib userenv.lib)
   # iphlpapi.lib
 
 ELSE(WIN32)
@@ -272,9 +272,13 @@ IF(WIN32)
     # autodetecting code to do the right thing.
     _WEBSOCKETPP_CPP11_CHRONO_
   )
-  # Activate C++ exception handling, assume extern C calls don't throw
-  # Add /U options to be sure settings specific to dynamic boost link are ineffective
-  target_compile_options(fc PUBLIC /EHsc /UBOOST_ALL_DYN_LINK /UBOOST_LINKING_PYTHON /UBOOST_DEBUG_PYTHON)
+  if( MSVC )
+    # Activate C++ exception handling, assume extern C calls don't throw
+    # Add /U options to be sure settings specific to dynamic boost link are ineffective
+    target_compile_options(fc PUBLIC /EHsc /UBOOST_ALL_DYN_LINK /UBOOST_LINKING_PYTHON /UBOOST_DEBUG_PYTHON)
+  elseif( MINGW )
+     # Put MinGW specific compiler settings here
+  endif()
 ELSE()
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
 
@@ -297,6 +301,7 @@ target_include_directories(fc
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${Boost_INCLUDE_DIR}
     ${OPENSSL_INCLUDE_DIR}
+    "vendor/diff-match-patch-cpp-stl"
     "${readline_includes}"
 
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -319,11 +324,11 @@ endif(MSVC)
 
 
 IF(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY MATCHES "\\.(a|lib)$")
-IF(WIN32)
+IF(MSVC)
 add_definitions(/DBOOST_TEST_DYN_LINK)
-ELSE(WIN32)
+ELSE(MSVC)
 add_definitions(-DBOOST_TEST_DYN_LINK)
-ENDIF(WIN32)
+ENDIF(MSVC)
 ENDIF()
 
 add_executable( api tests/api.cpp )
@@ -489,8 +494,15 @@ ELSE()
 ENDIF()
 
     IF(WIN32)
-SET(POST_BUILD_STEP_COMMANDS ${POST_BUILD_STEP_COMMANDS}
-     COMMAND ${CMAKE_COMMAND} -E copy_if_different "${OPENSSL_ROOT_DIR}/ssl/openssl.cnf" "${OPENSSL_CONF_TARGET}/openssl.cnf")
+       IF("${OPENSSL_ROOT_DIR}" STREQUAL "")
+          get_filename_component(OPENSSL_ROOT_DIR "${OPENSSL_INCLUDE_DIR}/.." REALPATH)
+       ENDIF()
+       SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/ssl/openssl.cnf")
+       IF(MINGW)
+          SET(OPENSSL_CONF_SOURCE "${OPENSSL_ROOT_DIR}/openssl.cnf")
+       ENDIF(MINGW)
+       SET(POST_BUILD_STEP_COMMANDS ${POST_BUILD_STEP_COMMANDS}
+           COMMAND ${CMAKE_COMMAND} -E copy_if_different "${OPENSSL_CONF_SOURCE}" "${OPENSSL_CONF_TARGET}/openssl.cnf")
     ENDIF(WIN32)
 
 ADD_CUSTOM_COMMAND(TARGET fc POST_BUILD ${POST_BUILD_STEP_COMMANDS}
diff --git a/src/byteswap.hpp b/src/byteswap.hpp
index 1a0e534..e75b8e3 100644
--- a/src/byteswap.hpp
+++ b/src/byteswap.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 # include <stdlib.h>
 # define bswap_64(x) _byteswap_uint64(x)
 #elif defined(__APPLE__)
diff --git a/src/compress/miniz.c b/src/compress/miniz.c
index 358143a..7123d62 100644
--- a/src/compress/miniz.c
+++ b/src/compress/miniz.c
@@ -2848,7 +2848,7 @@ void *tdefl_write_image_to_png_file_in_memory(const void *pImage, int w, int h,
   #include <stdio.h>
   #include <sys/stat.h>
 
-  #if defined(_MSC_VER) || defined(__MINGW64__)
+  #if defined(_MSC_VER)
     static FILE *mz_fopen(const char *pFilename, const char *pMode)
     {
       FILE* pFile = NULL;
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
index 0704b7b..7564816 100644
--- a/src/crypto/aes.cpp
+++ b/src/crypto/aes.cpp
@@ -16,8 +16,8 @@
 #endif
 #include <openssl/crypto.h>
 
-#if defined(_MSC_VER)
-# include <Windows.h>
+#if defined(_WIN32)
+# include <windows.h>
 #endif
 
 namespace fc {
@@ -396,7 +396,7 @@ boost::mutex*         openssl_thread_config::openssl_mutexes = nullptr;
 
 unsigned long openssl_thread_config::get_thread_id()
 {
-#ifdef _MSC_VER
+#ifdef _WIN32
   return (unsigned long)::GetCurrentThreadId();
 #else
   return (unsigned long)(&fc::thread::current());    // TODO: should expose boost thread id
diff --git a/src/crypto/city.cpp b/src/crypto/city.cpp
index 18367fb..971b7bd 100644
--- a/src/crypto/city.cpp
+++ b/src/crypto/city.cpp
@@ -75,7 +75,7 @@ static uint32_t UNALIGNED_LOAD32(const char *p) {
   return result;
 }
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 
 #include <stdlib.h>
 #define bswap_32(x) _byteswap_ulong(x)
diff --git a/src/crypto/elliptic_common.cpp b/src/crypto/elliptic_common.cpp
index 88228b0..66b75d0 100644
--- a/src/crypto/elliptic_common.cpp
+++ b/src/crypto/elliptic_common.cpp
@@ -5,7 +5,7 @@
 #include <fc/crypto/openssl.hpp>
 #include <fc/crypto/ripemd160.hpp>
 
-#ifdef _MSC_VER
+#ifdef _WIN32
 # include <malloc.h>
 #else
 # include <alloca.h>
diff --git a/src/crypto/elliptic_secp256k1.cpp b/src/crypto/elliptic_secp256k1.cpp
index f4175d0..91edc18 100644
--- a/src/crypto/elliptic_secp256k1.cpp
+++ b/src/crypto/elliptic_secp256k1.cpp
@@ -12,7 +12,7 @@
 #include <assert.h>
 #include <secp256k1.h>
 
-#ifdef _MSC_VER
+#if _WIN32
 # include <malloc.h>
 #else
 # include <alloca.h>
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
index a590065..a7151c5 100644
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -11,10 +11,10 @@
 #include <boost/config.hpp>
 #include <boost/filesystem.hpp>
 
-#ifdef WIN32
-# include <Windows.h>
-# include <UserEnv.h>
-# include <ShlObj.h>
+#ifdef _WIN32
+# include <windows.h>
+# include <userenv.h>
+# include <shlobj.h>
 #else
   #include <sys/types.h>
   #include <sys/stat.h>
diff --git a/src/network/tcp_socket.cpp b/src/network/tcp_socket.cpp
index cb96bbb..499a0ed 100644
--- a/src/network/tcp_socket.cpp
+++ b/src/network/tcp_socket.cpp
@@ -8,7 +8,7 @@
 #include <fc/exception/exception.hpp>
 
 #if defined _WIN32 || defined WIN32 || defined OS_WIN64 || defined _WIN64 || defined WIN64 || defined WINNT
-# include <MSTcpIP.h>
+# include <mstcpip.h>
 #endif
 
 namespace fc {
diff --git a/src/thread/thread.cpp b/src/thread/thread.cpp
index eaa8e40..7730a3a 100644
--- a/src/thread/thread.cpp
+++ b/src/thread/thread.cpp
@@ -5,7 +5,7 @@
 #include "thread_d.hpp"
 
 #if defined(_MSC_VER) && !defined(NDEBUG)
-# include <Windows.h>
+# include <windows.h>
 const DWORD MS_VC_EXCEPTION=0x406D1388;
 
 #pragma pack(push,8)
diff --git a/vendor/udt4/CMakeLists.txt b/vendor/udt4/CMakeLists.txt
index 9d65ee7..cee52ed 100644
--- a/vendor/udt4/CMakeLists.txt
+++ b/vendor/udt4/CMakeLists.txt
@@ -2,7 +2,7 @@
 IF( APPLE )
    add_definitions( -DOSX )
 ELSEIF( WIN32 )
-
+   add_definitions( -DWIN32 )
 ELSE()
    add_definitions( -DLINUX )
 ENDIF() 

From 580d626fdda50c234ff755a63fde958397140590 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Sun, 22 May 2016 03:07:14 -0400
Subject: [PATCH 018/108] Fix diff-match-patch submodule

---
 vendor/diff-match-patch-cpp-stl | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 vendor/diff-match-patch-cpp-stl

diff --git a/vendor/diff-match-patch-cpp-stl b/vendor/diff-match-patch-cpp-stl
new file mode 160000
index 0000000..aee799a
--- /dev/null
+++ b/vendor/diff-match-patch-cpp-stl
@@ -0,0 +1 @@
+Subproject commit aee799a31d08977b166fb19cad794730717e3304

From 2bc237537cb3890b980fae811bd21493761f430a Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Tue, 24 May 2016 19:24:03 -0400
Subject: [PATCH 019/108] updating websocket and adding new utf8 code

---
 include/fc/utf8.hpp | 28 +++++++++++++++-------------
 src/utf8.cpp        | 20 ++++++++++++++++++++
 vendor/websocketpp  |  2 +-
 3 files changed, 36 insertions(+), 14 deletions(-)

diff --git a/include/fc/utf8.hpp b/include/fc/utf8.hpp
index 3af2abe..c573029 100644
--- a/include/fc/utf8.hpp
+++ b/include/fc/utf8.hpp
@@ -8,19 +8,21 @@
 namespace fc
 {
 
-bool is_utf8( const std::string& str );
-
-/** Decodes utf 8 std::string into unicode string.
-    @param input   - input string to be decoded and stored in 'storage'
-    @param storage - buffer for converted text. Cannot be nullptr.
-*/
-void decodeUtf8(const std::string& input, std::wstring* storage);
-  
-/** Encodes given wide (unicode) string into UTF-8 representation.
-    @param input - input string to be encoded and stored in 'storage'
-    @param storage - buffer for converted text. Cannot be nullptr.
-*/
-void encodeUtf8(const std::wstring& input, std::string* storage);
+   std::string prune_invalid_utf8( const std::string& str );
+
+   bool is_utf8( const std::string& str );
+
+   /** Decodes utf 8 std::string into unicode string.
+       @param input   - input string to be decoded and stored in 'storage'
+       @param storage - buffer for converted text. Cannot be nullptr.
+   */
+   void decodeUtf8(const std::string& input, std::wstring* storage);
+     
+   /** Encodes given wide (unicode) string into UTF-8 representation.
+       @param input - input string to be encoded and stored in 'storage'
+       @param storage - buffer for converted text. Cannot be nullptr.
+   */
+   void encodeUtf8(const std::wstring& input, std::string* storage);
 
 } /// namespace fc
 
diff --git a/src/utf8.cpp b/src/utf8.cpp
index 0bab5e0..14551c4 100644
--- a/src/utf8.cpp
+++ b/src/utf8.cpp
@@ -3,16 +3,36 @@
 #include "utf8/checked.h"
 #include "utf8/core.h"
 #include "utf8/unchecked.h"
+#include <websocketpp/utf8_validator.hpp>
 
 #include <assert.h>
+#include <fc/log/logger.hpp>
+#include <iostream>
 
 namespace fc {
 
    bool is_utf8( const std::string& str )
    {
+      auto itr = utf8::find_invalid(str.begin(), str.end()); 
       return utf8::is_valid( str.begin(), str.end() );
    }
 
+   string prune_invalid_utf8( const string& str ) {
+      string result;
+
+      auto itr = utf8::find_invalid(str.begin(), str.end()); 
+      if( itr == str.end() ) return str;
+
+      result = string( str.begin(), itr );
+      while( itr != str.end() ) {
+         ++itr;
+         auto start = itr;
+         itr = utf8::find_invalid( start, str.end()); 
+         result += string( start, itr );
+      }
+      return result;
+   }
+
    void decodeUtf8(const std::string& input, std::wstring* storage)
    {
      assert(storage != nullptr);
diff --git a/vendor/websocketpp b/vendor/websocketpp
index c5510d6..378437a 160000
--- a/vendor/websocketpp
+++ b/vendor/websocketpp
@@ -1 +1 @@
-Subproject commit c5510d6de04917812b910a8dd44735c1f17061d9
+Subproject commit 378437aecdcb1dfe62096ffd5d944bf1f640ccc3

From 67fe2cfe162da1158d05476829d35ff2b206d4b5 Mon Sep 17 00:00:00 2001
From: arhag <arhag@users.noreply.github.com>
Date: Thu, 26 May 2016 15:45:51 -0400
Subject: [PATCH 020/108] Changes to secp256k1 build that should speed up hash
 rate on Windows

---
 CMakeLists.txt | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8d9e2e..86e8a32 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ ELSE( ECC_IMPL STREQUAL openssl )
 ENDIF( ECC_IMPL STREQUAL openssl )
 
 # Configure secp256k1-zkp
-if ( WIN32 )
+if ( MSVC )
     # autoconf won't work here, hard code the defines
     set( SECP256K1_DIR "${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp" )
 
@@ -65,8 +65,18 @@ if ( WIN32 )
         USE_SCALAR_8X32
         USE_SCALAR_INV_BUILTIN )
     set_target_properties( secp256k1 PROPERTIES COMPILE_DEFINITIONS "${SECP256K1_BUILD_DEFINES}" LINKER_LANGUAGE C )
-else ( WIN32 )
+else ( MSVC )
     include(ExternalProject)
+    if ( MINGW )
+    ExternalProject_Add( project_secp256k1
+     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/vendor/secp256k1-zkp
+     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
+     CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp/configure --prefix=${CMAKE_CURRENT_BINARY_DIR}/vendor/secp256k1-zkp --with-bignum=no  --host=x86_64-w64-mingw32
+     BUILD_COMMAND make
+     INSTALL_COMMAND true
+     BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/vendor/secp256k1-zkp/src/project_secp256k1-build/.libs/libsecp256k1.a
+    )
+    else ( MINGW )
     ExternalProject_Add( project_secp256k1
      PREFIX ${CMAKE_CURRENT_BINARY_DIR}/vendor/secp256k1-zkp
      SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
@@ -75,6 +85,7 @@ else ( WIN32 )
      INSTALL_COMMAND true
      BUILD_BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/vendor/secp256k1-zkp/src/project_secp256k1-build/.libs/libsecp256k1.a
     )
+    endif ( MINGW )
     ExternalProject_Add_Step(project_secp256k1 autogen
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
      COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp/autogen.sh
@@ -87,7 +98,7 @@ else ( WIN32 )
     set_property(TARGET secp256k1 PROPERTY IMPORTED_LOCATION ${binary_dir}/.libs/libsecp256k1${CMAKE_STATIC_LIBRARY_SUFFIX})
     set_property(TARGET secp256k1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp/include)
     add_dependencies(secp256k1 project_secp256k1)
-endif ( WIN32 )
+endif ( MSVC )
 # End configure secp256k1-zkp
 
 IF( WIN32 )

From c109dbecf3bf72b464f994e1870d93af34095e9c Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Mon, 27 Jun 2016 16:22:14 -0400
Subject: [PATCH 021/108] improve performince of fc::uin128 divide

---
 src/asio.cpp               | 10 ++++++----
 src/network/tcp_socket.cpp |  2 +-
 src/uint128.cpp            | 26 ++++++++++++++++++++++++--
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/asio.cpp b/src/asio.cpp
index 0319eaa..4a512f1 100644
--- a/src/asio.cpp
+++ b/src/asio.cpp
@@ -140,10 +140,12 @@ namespace fc {
 
     /// If cleanup is true, do not use the return value; it is a null reference
     boost::asio::io_service& default_io_service(bool cleanup) {
-        static default_io_service_scope fc_asio_service;
-        if (cleanup)
-           fc_asio_service.cleanup();
-        return *fc_asio_service.io;
+        static default_io_service_scope fc_asio_service[4];
+        if (cleanup) {
+           for( int i = 0; i < 4; ++i )
+              fc_asio_service[i].cleanup();
+        }
+        return *fc_asio_service[0].io;
     }
 
     namespace tcp {
diff --git a/src/network/tcp_socket.cpp b/src/network/tcp_socket.cpp
index 499a0ed..7eee2ab 100644
--- a/src/network/tcp_socket.cpp
+++ b/src/network/tcp_socket.cpp
@@ -309,7 +309,7 @@ namespace fc {
     try
     {
       my->_accept.bind(boost::asio::ip::tcp::endpoint(boost::asio::ip::address_v4(), port));
-      my->_accept.listen();
+      my->_accept.listen(256);
     } 
     FC_RETHROW_EXCEPTIONS(warn, "error listening on socket");
   }
diff --git a/src/uint128.cpp b/src/uint128.cpp
index dae2aef..66128ce 100644
--- a/src/uint128.cpp
+++ b/src/uint128.cpp
@@ -1,15 +1,18 @@
 #include <fc/uint128.hpp>
 #include <fc/variant.hpp>
 #include <fc/crypto/bigint.hpp>
+#include <boost/multiprecision/cpp_int.hpp>
+
 #include <stdexcept>
 #include "byteswap.hpp"
 
 namespace fc 
 {
+    typedef boost::multiprecision::uint128_t  m128;
+
     template <typename T>
     static void divide(const T &numerator, const T &denominator, T &quotient, T &remainder) 
     {
-
       static const int bits = sizeof(T) * 8;//CHAR_BIT;
 
       if(denominator == 0) {
@@ -220,8 +223,27 @@ namespace fc
 
     uint128& uint128::operator/=(const uint128 &b) 
     {
+        auto self = (m128(hi) << 64) + m128(lo);
+        auto other = (m128(b.hi) << 64) + m128(b.lo);
+        self /= other;
+        hi = static_cast<uint64_t>(self >> 64);
+        lo = static_cast<uint64_t>((self << 64 ) >> 64);
+
+        /*
         uint128 remainder;
-        divide(*this, b, *this, remainder);
+        divide(*this, b, *this, remainder ); //, *this);
+        if( tmp.hi != hi || tmp.lo != lo ) {
+           std::cerr << tmp.hi << "  " << hi <<"\n";
+           std::cerr << tmp.lo << "  " << lo << "\n";
+           exit(1);
+        }
+        */
+       
+        /*
+        const auto&  b128 = std::reinterpret_cast<const m128&>(b);
+        auto&     this128 = std::reinterpret_cast<m128&>(*this);
+        this128 /= b128;
+        */
         return *this;
     }
 

From e5ffc620ba2dcda97b30b3c6f13b9ec7f6ff5801 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dlarimer@invictus-innovations.com>
Date: Mon, 18 Jul 2016 21:20:40 -0400
Subject: [PATCH 022/108] updating fc to support more threads

---
 src/asio.cpp                   | 62 +++++++++++++++++++---------------
 src/network/http/websocket.cpp |  5 +++
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/asio.cpp b/src/asio.cpp
index 4a512f1..0169576 100644
--- a/src/asio.cpp
+++ b/src/asio.cpp
@@ -93,45 +93,51 @@ namespace fc {
     struct default_io_service_scope
     {
        boost::asio::io_service*          io;
-       boost::thread*                    asio_thread;
+       std::vector<boost::thread*>       asio_threads;
        boost::asio::io_service::work*    the_work;
 
        default_io_service_scope()
        {
             io           = new boost::asio::io_service();
             the_work     = new boost::asio::io_service::work(*io);
-            asio_thread  = new boost::thread( [=]()
-            {
-              fc::thread::current().set_name("asio");
-              while (!io->stopped())
-              {
-                try
-                {
-                  io->run();
-                }
-                catch (const fc::exception& e)
-                {
-                  elog("Caught unhandled exception in asio service loop: ${e}", ("e", e));
-                }
-                catch (const std::exception& e)
-                {
-                  elog("Caught unhandled exception in asio service loop: ${e}", ("e", e.what()));
-                }
-                catch (...)
-                {
-                  elog("Caught unhandled exception in asio service loop");
-                }
-              }
-            });
+            for( int i = 0; i < 8; ++i ) {
+               asio_threads.push_back( new boost::thread( [=]()
+               {
+                 fc::thread::current().set_name("asio");
+                 while (!io->stopped())
+                 {
+                   try
+                   {
+                     io->run();
+                   }
+                   catch (const fc::exception& e)
+                   {
+                     elog("Caught unhandled exception in asio service loop: ${e}", ("e", e));
+                   }
+                   catch (const std::exception& e)
+                   {
+                     elog("Caught unhandled exception in asio service loop: ${e}", ("e", e.what()));
+                   }
+                   catch (...)
+                   {
+                     elog("Caught unhandled exception in asio service loop");
+                   }
+                 }
+               }) );
+            }
        }
 
        void cleanup()
        {
           delete the_work;
           io->stop();
-          asio_thread->join();
+          for( auto asio_thread : asio_threads ) {
+             asio_thread->join();
+          }
           delete io;
-          delete asio_thread;
+          for( auto asio_thread : asio_threads ) {
+             delete asio_thread;
+          }
        }
 
        ~default_io_service_scope()
@@ -140,9 +146,9 @@ namespace fc {
 
     /// If cleanup is true, do not use the return value; it is a null reference
     boost::asio::io_service& default_io_service(bool cleanup) {
-        static default_io_service_scope fc_asio_service[4];
+        static default_io_service_scope fc_asio_service[1];
         if (cleanup) {
-           for( int i = 0; i < 4; ++i )
+           for( int i = 0; i < 1; ++i )
               fc_asio_service[i].cleanup();
         }
         return *fc_asio_service[0].io;
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index 594fc3a..1f92f77 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -204,6 +204,11 @@ namespace fc { namespace http {
                     }).wait();
                });
 
+               _server.set_socket_init_handler( [&](websocketpp::connection_hdl hdl, boost::asio::ip::tcp::socket& s ) {
+                      boost::asio::ip::tcp::no_delay option(true);
+                      s.lowest_layer().set_option(option);
+               } );
+
                _server.set_http_handler( [&]( connection_hdl hdl ){
                     _server_thread.async( [&](){
                        auto current_con = std::make_shared<websocket_connection_impl<websocket_server_type::connection_ptr>>( _server.get_con_from_hdl(hdl) );

From c672e3b4b4676ee90a63dbee4179207bbcd14e56 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Thu, 21 Jul 2016 12:54:16 -0400
Subject: [PATCH 023/108] json.cpp:  Add missing cases for control character
 escape sequences

---
 src/io/json.cpp | 58 +++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 9 deletions(-)

diff --git a/src/io/json.cpp b/src/io/json.cpp
index b3f57cc..787d08a 100644
--- a/src/io/json.cpp
+++ b/src/io/json.cpp
@@ -517,24 +517,64 @@ namespace fc
       {
          switch( *itr )
          {
-            case '\t':
-               os << "\\t";
+            case '\a':        // \x07
+               os << "\\a";
                break;
-            case '\n':
-               os << "\\n";
+            case '\b':        // \x08
+               os << "\\b";
                break;
-            case '\\':
-               os << "\\\\";
+            case '\f':        // \x0c
+               os << "\\f";
                break;
-            case '\r':
+            case '\n':        // \x0a
+               os << "\\n";
+               break;
+            case '\r':        // \x0d
                os << "\\r";
                break;
-            case '\a':
-               os << "\\a";
+            case '\t':        // \x09
+               os << "\\t";
+               break;
+            case '\\':
+               os << "\\\\";
                break;
             case '\"':
                os << "\\\"";
                break;
+            case '\x00': os << "\\u0000"; break;
+            case '\x01': os << "\\u0001"; break;
+            case '\x02': os << "\\u0002"; break;
+            case '\x03': os << "\\u0003"; break;
+            case '\x04': os << "\\u0004"; break;
+            case '\x05': os << "\\u0005"; break;
+            case '\x06': os << "\\u0006"; break;
+         // case '\x07': os << "\\u0007"; break; // \a
+         // case '\x08': os << "\\u0008"; break; // \b
+         // case '\x09': os << "\\u0009"; break; // \t
+         // case '\x0a': os << "\\u000a"; break; // \n
+            case '\x0b': os << "\\u000b"; break;
+         // case '\x0c': os << "\\u000c"; break; // \f
+         // case '\x0d': os << "\\u000d"; break; // \r
+            case '\x0e': os << "\\u000e"; break;
+            case '\x0f': os << "\\u000f"; break;
+
+            case '\x10': os << "\\u0010"; break;
+            case '\x11': os << "\\u0011"; break;
+            case '\x12': os << "\\u0012"; break;
+            case '\x13': os << "\\u0013"; break;
+            case '\x14': os << "\\u0014"; break;
+            case '\x15': os << "\\u0015"; break;
+            case '\x16': os << "\\u0016"; break;
+            case '\x17': os << "\\u0017"; break;
+            case '\x18': os << "\\u0018"; break;
+            case '\x19': os << "\\u0019"; break;
+            case '\x1a': os << "\\u001a"; break;
+            case '\x1b': os << "\\u001b"; break;
+            case '\x1c': os << "\\u001c"; break;
+            case '\x1d': os << "\\u001d"; break;
+            case '\x1e': os << "\\u001e"; break;
+            case '\x1f': os << "\\u001f"; break;
+
             default:
                os << *itr;
                //toUTF8( *itr, os );

From e8e26838cce1190331db20b0f930140961080b4a Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dlarimer@invictus-innovations.com>
Date: Sat, 30 Jul 2016 18:41:03 -0400
Subject: [PATCH 024/108] first step toward binary RPC

---
 include/fc/rpc/bstate.hpp | 58 +++++++++++++++++++++++++++++++++
 src/rpc/bstate.cpp        | 68 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 include/fc/rpc/bstate.hpp
 create mode 100644 src/rpc/bstate.cpp

diff --git a/include/fc/rpc/bstate.hpp b/include/fc/rpc/bstate.hpp
new file mode 100644
index 0000000..b7c74b7
--- /dev/null
+++ b/include/fc/rpc/bstate.hpp
@@ -0,0 +1,58 @@
+#pragma once
+#include <fc/variant.hpp>
+#include <functional>
+#include <fc/thread/future.hpp>
+#include <fc/rpc/state.hpp>
+
+namespace fc { namespace rpc {
+   typedef std::vector<char> params_type;
+   typedef std::vector<char> result_type;
+
+   struct brequest
+   {
+      optional<uint64_t>  id;
+      std::string         method;
+      params_type         params;
+   };
+
+   struct bresponse
+   {
+      bresponse(){}
+      bresponse( int64_t i, result_type r ):id(i),result(r){}
+      bresponse( int64_t i, error_object r ):id(i),error(r){}
+      int64_t                id = 0;
+      optional<result_type>  result;
+      optional<error_object> error;
+   };
+
+   /** binary RPC state */
+   class bstate
+   {
+      public:
+         typedef std::function<result_type(const params_type&)>  method;
+         ~bstate();
+
+         void add_method( const fc::string& name, method m );
+         void remove_method( const fc::string& name );
+
+         result_type local_call( const string& method_name, const params_type& args );
+         void    handle_reply( const bresponse& response );
+
+         brequest start_remote_call( const string& method_name, params_type args );
+         result_type wait_for_response( uint64_t request_id );
+
+         void close();
+
+         void on_unhandled( const std::function<result_type(const string&,const params_type&)>& unhandled );
+
+      private:
+         uint64_t                                                      _next_id = 1;
+         std::unordered_map<uint64_t, fc::promise<result_type>::ptr>   _awaiting;
+         std::unordered_map<std::string, method>                       _methods;
+         std::function<result_type(const string&,const params_type&)>         _unhandled;
+   };
+} }  // namespace  fc::rpc
+
+FC_REFLECT( fc::rpc::brequest, (id)(method)(params) );
+FC_REFLECT( fc::rpc::bresponse, (id)(result)(error) )
+
diff --git a/src/rpc/bstate.cpp b/src/rpc/bstate.cpp
new file mode 100644
index 0000000..832f8ce
--- /dev/null
+++ b/src/rpc/bstate.cpp
@@ -0,0 +1,68 @@
+#include <fc/rpc/bstate.hpp>
+#include <fc/thread/thread.hpp>
+#include <fc/reflect/variant.hpp>
+
+namespace fc { namespace rpc {
+bstate::~bstate()
+{
+   close();
+}
+
+void bstate::add_method( const fc::string& name, method m )
+{
+   _methods.emplace(std::pair<std::string,method>(name,fc::move(m)));
+}
+
+void bstate::remove_method( const fc::string& name )
+{
+   _methods.erase(name);
+}
+
+result_type bstate::local_call( const string& method_name, const params_type& args )
+{
+   auto method_itr = _methods.find(method_name);
+   if( method_itr == _methods.end() && _unhandled )
+      return _unhandled( method_name, args );
+   FC_ASSERT( method_itr != _methods.end(), "Unknown Method: ${name}", ("name",method_name) );
+   return method_itr->second(args);
+}
+
+void  bstate::handle_reply( const bresponse& bresponse )
+{
+   auto await = _awaiting.find( bresponse.id );
+   FC_ASSERT( await != _awaiting.end(), "Unknown Response ID: ${id}", ("id",bresponse.id)("bresponse",bresponse) );
+   if( bresponse.result ) 
+      await->second->set_value( *bresponse.result );
+   else if( bresponse.error )
+   {
+      await->second->set_exception( exception_ptr(new FC_EXCEPTION( exception, "${error}", ("error",bresponse.error->message)("data",bresponse) ) ) );
+   }
+   else
+      await->second->set_value( params_type() );
+   _awaiting.erase(await);
+}
+
+brequest bstate::start_remote_call( const string& method_name, params_type args )
+{
+   brequest brequest{ _next_id++, method_name, std::move(args) };
+   _awaiting[*brequest.id] = fc::promise<result_type>::ptr( new fc::promise<result_type>("json_connection::async_call") );
+   return brequest;
+}
+result_type bstate::wait_for_response( uint64_t request_id )
+{
+   auto itr = _awaiting.find(request_id);
+   FC_ASSERT( itr != _awaiting.end() );
+   return fc::future<result_type>( itr->second ).wait();
+}
+void bstate::close()
+{
+   for( auto item : _awaiting )
+      item.second->set_exception( fc::exception_ptr(new FC_EXCEPTION( eof_exception, "connection closed" )) );
+   _awaiting.clear();
+}
+void bstate::on_unhandled( const std::function<result_type(const string&, const params_type&)>& unhandled )
+{
+   _unhandled = unhandled;
+}
+
+} }  // namespace fc::rpc

From de9a29c33e9f1601e1d51b24bdd6b637e9f0a90e Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dlarimer@invictus-innovations.com>
Date: Sat, 30 Jul 2016 19:24:15 -0400
Subject: [PATCH 025/108] Progress toward binary RPC"

---
 CMakeLists.txt        |  1 +
 include/fc/io/raw.hpp | 21 +++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86e8a32..b53146f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -191,6 +191,7 @@ set( fc_sources
      src/rpc/http_api.cpp
      src/rpc/json_connection.cpp
      src/rpc/state.cpp
+     src/rpc/bstate.cpp
      src/rpc/websocket_api.cpp
      src/log/log_message.cpp
      src/log/logger.cpp
diff --git a/include/fc/io/raw.hpp b/include/fc/io/raw.hpp
index bc5cd22..288c3c9 100644
--- a/include/fc/io/raw.hpp
+++ b/include/fc/io/raw.hpp
@@ -17,6 +17,13 @@
 
 namespace fc {
     namespace raw {
+
+    template<typename Stream, typename Arg0, typename... Args>
+    inline void pack( Stream& s, const Arg0& a0, Args... args ) {
+       pack( s, a0 );
+       pack( s, args... );
+    }
+
     template<typename Stream>
     inline void pack( Stream& s, const fc::exception& e )
     {
@@ -547,6 +554,20 @@ namespace fc {
       return vec;
     }
 
+    template<typename T, typename... Next>
+    inline std::vector<char> pack(  const T& v, Next... next ) {
+      datastream<size_t> ps;
+      fc::raw::pack(ps,v,next...);
+      std::vector<char> vec(ps.tellp());
+
+      if( vec.size() ) {
+        datastream<char*>  ds( vec.data(), size_t(vec.size()) );
+        fc::raw::pack(ds,v,next...);
+      }
+      return vec;
+    }
+
+
     template<typename T>
     inline T unpack( const std::vector<char>& s )
     { try  {

From d74f49ab048e20b33e1f59c2ae4f49ec8f8bcfae Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dlarimer@invictus-innovations.com>
Date: Sat, 30 Jul 2016 19:25:32 -0400
Subject: [PATCH 026/108] progress on binary api connection

---
 include/fc/rpc/binary_api_connection.hpp | 532 +++++++++++++++++++++++
 1 file changed, 532 insertions(+)
 create mode 100644 include/fc/rpc/binary_api_connection.hpp

diff --git a/include/fc/rpc/binary_api_connection.hpp b/include/fc/rpc/binary_api_connection.hpp
new file mode 100644
index 0000000..9c9ce2f
--- /dev/null
+++ b/include/fc/rpc/binary_api_connection.hpp
@@ -0,0 +1,532 @@
+#pragma once
+#include <fc/variant.hpp>
+#include <fc/io/raw.hpp>
+#include <fc/optional.hpp>
+#include <fc/api.hpp>
+#include <fc/any.hpp>
+#include <memory>
+#include <vector>
+#include <functional>
+#include <utility>
+#include <fc/signals.hpp>
+//#include <fc/rpc/json_connection.hpp>
+
+namespace fc {
+   class binary_api_connection;
+
+   namespace detail {
+      template<typename Signature>
+      class callback_functor
+      {
+         public:
+            typedef typename std::function<Signature>::result_type result_type;
+
+            callback_functor( std::weak_ptr< fc::binary_api_connection > con, uint64_t id )
+            :_callback_id(id),_binary_api_connection(con){}
+
+            template<typename... Args> 
+            result_type operator()( Args... args )const;
+
+         private:
+            uint64_t _callback_id;
+            std::weak_ptr< fc::binary_api_connection > _binary_api_connection;
+      };
+
+      template<typename R, typename Arg0, typename ... Args>
+      std::function<R(Args...)> bind_first_arg( const std::function<R(Arg0,Args...)>& f, Arg0 a0 )
+      {
+         return [=]( Args... args ) { return f( a0, args... ); };
+      }
+      template<typename R>
+      R call_generic( const std::function<R()>& f, variants::const_iterator a0, variants::const_iterator e )
+      {
+         return f();
+      }
+
+      template<typename R, typename Arg0, typename ... Args>
+      R call_generic( const std::function<R(Arg0,Args...)>& f, variants::const_iterator a0, variants::const_iterator e )
+      {
+         FC_ASSERT( a0 != e );
+         return  call_generic<R,Args...>( bind_first_arg<R,Arg0,Args...>( f, a0->as< typename std::decay<Arg0>::type >() ), a0+1, e );
+      }
+
+      template<typename R, typename ... Args>
+      std::function<variant(const fc::variants&)> to_generic( const std::function<R(Args...)>& f )
+      {
+         return [=]( const variants& args ) { 
+            return variant( call_generic( f, args.begin(), args.end() ) ); 
+         };
+      }
+
+      template<typename ... Args>
+      std::function<variant(const fc::variants&)> to_generic( const std::function<void(Args...)>& f )
+      {
+         return [=]( const variants& args ) { 
+            call_generic( f, args.begin(), args.end() ); 
+            return variant();
+         };
+      }
+
+      /**
+       * If api<T> is returned from a remote method, the API is eagerly bound to api<T> of
+       * the correct type in api_visitor::from_variant().  This binding [1] needs a reference
+       * to the binary_api_connection, which is made available to from_variant() as a parameter.
+       *
+       * However, in the case of a remote method which returns api_base which can subsequently
+       * be cast by the caller with as<T>, we need to keep track of the connection because
+       * the binding is done later (when the client code actually calls as<T>).
+       *
+       * [1] The binding actually happens in get_remote_api().
+       */
+      class any_api : public api_base
+      {
+         public:
+            any_api( api_id_type api_id, const std::shared_ptr<fc::binary_api_connection>& con )
+               : _api_id(api_id), _binary_api_connection(con) {}
+
+            virtual uint64_t get_handle()const override
+            {  return _api_id;    }
+
+            virtual api_id_type register_api( binary_api_connection& conn )const override
+            {  FC_ASSERT( false ); return api_id_type(); }
+
+            api_id_type                         _api_id;
+            std::weak_ptr<fc::binary_api_connection>   _binary_api_connection;
+      };
+
+   } // namespace detail
+
+   class generic_api
+   {
+      public:
+         template<typename Api>
+         generic_api( const Api& a, const std::shared_ptr<fc::binary_api_connection>& c );
+
+         generic_api( const generic_api& cpy ) = delete;
+
+         vector<char> call( const string& name, const vector<char>& args )
+         {
+            auto itr = _by_name.find(name);
+            FC_ASSERT( itr != _by_name.end(), "no method with name '${name}'", ("name",name)("api",_by_name) );
+            return call( itr->second, args );
+         }
+
+         vector<char> call( uint32_t method_id, const vector<char>& args )
+         {
+            FC_ASSERT( method_id < _methods.size() );
+            return _methods[method_id](args);
+         }
+
+         std::weak_ptr< fc::binary_api_connection > get_connection()
+         {
+            return _binary_api_connection;
+         }
+
+         std::vector<std::string> get_method_names()const
+         {
+            std::vector<std::string> result;
+            result.reserve( _by_name.size() );
+            for( auto& m : _by_name ) result.push_back(m.first);
+            return result;
+         }
+
+      private:
+         friend struct api_visitor;
+
+         template<typename R, typename Arg0, typename ... Args>
+         std::function<R(Args...)> bind_first_arg( const std::function<R(Arg0,Args...)>& f, Arg0 a0 )const
+         {
+            return [=]( Args... args ) { return f( a0, args... ); };
+         }
+
+         template<typename R>
+         R call_generic( const std::function<R()>& f, datastream<const char*>& ds )const
+         {
+            return f();
+         }
+
+         template<typename R, typename Signature, typename ... Args>
+         R call_generic( const std::function<R(std::function<Signature>,Args...)>& f, datastream<const char*>& ds )
+         {
+            uint64_t callback_id = 0;
+            fc::raw::unpack( ds, callback_id );
+            detail::callback_functor<Signature> arg0( get_connection(), callback_id );
+            return  call_generic<R,Args...>( this->bind_first_arg<R,std::function<Signature>,Args...>( f, std::function<Signature>(arg0) ), ds );
+         }
+         template<typename R, typename Signature, typename ... Args>
+         R call_generic( const std::function<R(const std::function<Signature>&,Args...)>& f, fc::datastream<const char*>& ds )
+         {
+            uint64_t callback_id = 0;
+            fc::raw::unpack( ds, callback_id );
+            detail::callback_functor<Signature> arg0( get_connection(), callback_id );
+            return  call_generic<R,Args...>( this->bind_first_arg<R,const std::function<Signature>&,Args...>( f, arg0 ), ds );
+         }
+
+         template<typename R, typename Arg0, typename ... Args>
+         R call_generic( const std::function<R(Arg0,Args...)>& f, fc::datastream<const char*>& ds )
+         {
+            std::decay<Arg0>::type a0;
+            fc::raw::unpack( ds, a0 );
+            return  call_generic<R,Args...>( this->bind_first_arg<R,Arg0,Args...>( f, a0 ), ds );
+         }
+
+         struct api_visitor
+         {
+            api_visitor( generic_api& a, const std::weak_ptr<fc::binary_api_connection>& s ):api(a),_api_con(s){ }
+
+            template<typename Interface, typename Adaptor, typename ... Args>
+            std::function<variant(const fc::variants&)> to_generic( const std::function<api<Interface,Adaptor>(Args...)>& f )const;
+
+            template<typename Interface, typename Adaptor, typename ... Args>
+            std::function<variant(const fc::variants&)> to_generic( const std::function<fc::optional<api<Interface,Adaptor>>(Args...)>& f )const;
+
+            template<typename ... Args>
+            std::function<variant(const fc::variants&)> to_generic( const std::function<fc::api_ptr(Args...)>& f )const;
+
+            template<typename R, typename ... Args>
+            std::function<variant(const fc::variants&)> to_generic( const std::function<R(Args...)>& f )const;
+
+            template<typename ... Args>
+            std::function<variant(const fc::variants&)> to_generic( const std::function<void(Args...)>& f )const;
+
+            template<typename Result, typename... Args>
+            void operator()( const char* name, std::function<Result(Args...)>& memb )const {
+               api._methods.emplace_back( to_generic( memb ) ); 
+               api._by_name[name] = api._methods.size() - 1;
+            }
+
+            generic_api&  api;
+            const std::weak_ptr<fc::binary_api_connection>& _api_con;
+         };
+
+
+         std::weak_ptr<fc::binary_api_connection>                         _binary_api_connection;
+         fc::any                                                          _api;
+         std::map< std::string, uint32_t >                                _by_name;
+         std::vector< std::function<vector<char>(const vector<char>&)> >  _methods;
+   }; // class generic_api
+
+
+
+   class binary_api_connection : public std::enable_shared_from_this<fc::binary_api_connection>
+   {
+      public:
+         typedef std::vector<char> params_type;
+         typedef std::vector<char> result_type;
+
+         binary_api_connection(){}
+         virtual ~binary_api_connection(){};
+
+
+         template<typename T>
+         api<T> get_remote_api( api_id_type api_id = 0 )
+         {
+            api<T> result;
+            result->visit( api_visitor(  api_id, this->shared_from_this() ) );
+            return result;
+         }
+  
+         /** makes calls to the remote server */
+         virtual result_type send_call( api_id_type api_id, string method_name, params_type args = params_type() ) = 0;
+         virtual result_type send_callback( uint64_t callback_id, params_type args = params_type() ) = 0;
+         virtual void    send_notice( uint64_t callback_id, params_type args = params_type() ) = 0;
+
+         result_type receive_call( api_id_type api_id, const string& method_name, const params_type& args = params_type() )const
+         {
+            FC_ASSERT( _local_apis.size() > api_id );
+            return _local_apis[api_id]->call( method_name, args );
+         }
+         result_type receive_callback( uint64_t callback_id,  const params_type& args = params_type() )const
+         {
+            FC_ASSERT( _local_callbacks.size() > callback_id );
+            return _local_callbacks[callback_id]( args );
+         }
+         void receive_notice( uint64_t callback_id,  const params_type& args = params_type() )const
+         {
+            FC_ASSERT( _local_callbacks.size() > callback_id );
+            _local_callbacks[callback_id]( args );
+         }
+
+         template<typename Interface>
+         api_id_type register_api( const Interface& a )
+         {
+            auto handle = a.get_handle();
+            auto itr = _handle_to_id.find(handle);
+            if( itr != _handle_to_id.end() ) return itr->second;
+
+            _local_apis.push_back( std::unique_ptr<generic_api>( new generic_api(a, shared_from_this() ) ) );
+            _handle_to_id[handle] = _local_apis.size() - 1;
+            return _local_apis.size() - 1;
+         }
+
+         template<typename Signature>
+         uint64_t register_callback( const std::function<Signature>& cb )
+         {
+            _local_callbacks.push_back( detail::to_generic( cb ) );
+            return _local_callbacks.size() - 1;
+         }
+
+         std::vector<std::string> get_method_names( api_id_type local_api_id = 0 )const { return _local_apis[local_api_id]->get_method_names(); }
+
+         fc::signal<void()> closed;
+      private:
+         std::vector< std::unique_ptr<generic_api> >             _local_apis;
+         std::map< uint64_t, api_id_type >                       _handle_to_id;
+         std::vector< std::function<variant(const variants&)>  > _local_callbacks;
+
+
+         struct api_visitor
+         {
+            uint32_t                            _api_id;
+            std::shared_ptr<fc::binary_api_connection> _connection;
+
+            api_visitor( uint32_t api_id, std::shared_ptr<fc::binary_api_connection> con )
+            :_api_id(api_id),_connection(std::move(con))
+            {
+            }
+
+            api_visitor() = delete;
+
+            template<typename Result>
+            static Result from_vector( const vector<char>& v, Result*, const std::shared_ptr<fc::binary_api_connection>&  )
+            {
+               return fc::raw::unpack<Result>( v ); 
+            }
+
+            template<typename ResultInterface>
+            static fc::api<ResultInterface> from_vector( const vector<char>& v, 
+                                                          fc::api<ResultInterface>* /*used for template deduction*/,
+                                                          const std::shared_ptr<fc::binary_api_connection>&  con 
+                                                        )
+            {
+               return con->get_remote_api<ResultInterface>( fc::raw::unpack<uint64_t>( v ) );
+            }
+
+            static fc::api_ptr from_vector(
+               const vector<char>& v,
+               fc::api_ptr* /* used for template deduction */,
+               const std::shared_ptr<fc::binary_api_connection>&  con
+            )
+            {
+               return fc::api_ptr( new detail::any_api( fc::raw::unpack<uint64_t>(v), con ) );
+            }
+
+            template<typename T>
+            static result_type convert_callbacks( const std::shared_ptr<fc::binary_api_connection>&, const T& v ) 
+            { 
+               return fc::raw::pack(v); 
+            }
+
+            template<typename Signature>
+            static result_type convert_callbacks( const std::shared_ptr<fc::binary_api_connection>& con, const std::function<Signature>& v ) 
+            { 
+               return con->register_callback( v ); 
+            }
+
+            template<typename Result, typename... Args>
+            void operator()( const char* name, std::function<Result(Args...)>& memb )const 
+            {
+                auto con   = _connection;
+                auto api_id = _api_id;
+                memb = [con,api_id,name]( Args... args ) {
+                    auto var_result = con->send_call( api_id, name, { convert_callbacks(con,args)...} );
+                    return from_vector( var_result, (Result*)nullptr, con );
+                };
+            }
+            template<typename... Args>
+            void operator()( const char* name, std::function<void(Args...)>& memb )const 
+            {
+                auto con   = _connection;
+                auto api_id = _api_id;
+                memb = [con,api_id,name]( Args... args ) {
+                   con->send_call( api_id, name, { convert_callbacks(con,args)...} );
+                };
+            }
+         };
+   };
+
+   class local_binary_api_connection : public binary_api_connection
+   {
+      public:
+         /** makes calls to the remote server */
+         virtual result_type send_call( api_id_type api_id, string method_name, params_type args = params_type() ) override
+         {
+            FC_ASSERT( _remote_connection );
+            return _remote_connection->receive_call( api_id, method_name, std::move(args) );
+         }
+         virtual result_type send_callback( uint64_t callback_id, params_type args = params_type() ) override
+         {
+            FC_ASSERT( _remote_connection );
+            return _remote_connection->receive_callback( callback_id, args );
+         }
+         virtual void send_notice( uint64_t callback_id, params_type args = params_type() ) override
+         {
+            FC_ASSERT( _remote_connection );
+            _remote_connection->receive_notice( callback_id, args );
+         }
+
+
+         void  set_remote_connection( const std::shared_ptr<fc::binary_api_connection>& rc )
+         {
+            FC_ASSERT( !_remote_connection );
+            FC_ASSERT( rc != this->shared_from_this() );
+            _remote_connection = rc;
+         }
+         const std::shared_ptr<fc::binary_api_connection>& remote_connection()const  { return _remote_connection; }
+
+         std::shared_ptr<fc::binary_api_connection>    _remote_connection;
+   };
+
+   template<typename Api>
+   generic_api::generic_api( const Api& a, const std::shared_ptr<fc::binary_api_connection>& c )
+   :_binary_api_connection(c),_api(a)
+   {
+      boost::any_cast<const Api&>(a)->visit( api_visitor( *this, c ) );
+   }
+
+   template<typename Interface, typename Adaptor, typename ... Args>
+   std::function<result_type(const params_type&)> generic_api::api_visitor::to_generic( 
+                                               const std::function<fc::api<Interface,Adaptor>(Args...)>& f )const
+   {
+      auto api_con = _api_con;
+      auto gapi = &api;
+      return [=]( const params_type& args ) { 
+         auto con = api_con.lock();
+         FC_ASSERT( con, "not connected" );
+
+         fc::raw::datastream<const char*> ds( args.data(), args.size() );
+         auto api_result = gapi->call_generic( f, args ); 
+         return con->register_api( api_result );
+      };
+   }
+   template<typename Interface, typename Adaptor, typename ... Args>
+   std::function<result_type(const params_type&)> generic_api::api_visitor::to_generic( 
+                                               const std::function<fc::optional<fc::api<Interface,Adaptor>>(Args...)>& f )const
+   {
+      auto api_con = _api_con;
+      auto gapi = &api;
+      return [=]( const params_type& args )-> fc::variant { 
+         auto con = api_con.lock();
+         FC_ASSERT( con, "not connected" );
+
+         fc::raw::datastream<const char*> ds( args.data(), args.size() );
+         auto api_result = gapi->call_generic( f, ds ); 
+         if( api_result )
+            return con->register_api( *api_result );
+         return result_type();
+      };
+   }
+
+   template<typename ... Args>
+   std::function<result_type(const params_type&)> generic_api::api_visitor::to_generic(
+                                               const std::function<fc::api_ptr(Args...)>& f )const
+   {
+      auto api_con = _api_con;
+      auto gapi = &api;
+      return [=]( const variants& args ) -> fc::variant {
+         auto con = api_con.lock();
+         FC_ASSERT( con, "not connected" );
+
+         fc::raw::datastream<const char*> ds( args.data(), args.size() );
+         auto api_result = gapi->call_generic( f, ds );
+         if( !api_result )
+            return result_type();
+         return api_result->register_api( *con );
+      };
+   }
+
+   template<typename R, typename ... Args>
+   std::function<result_type(const params_type&)> generic_api::api_visitor::to_generic( const std::function<R(Args...)>& f )const
+   {
+      generic_api* gapi = &api;
+      return [f,gapi]( const params_type& args ) { 
+         fc::raw::datastream<const char*> ds( args.data(), args.size() );
+         return  fc::raw::pack(gapi->call_generic( f, ds )); 
+      };
+   }
+
+   template<typename ... Args>
+   std::function<result_type(const params_type&)> generic_api::api_visitor::to_generic( const std::function<void(Args...)>& f )const
+   {
+      generic_api* gapi = &api;
+      return [f,gapi]( const params_type& args ) { 
+         fc::raw::datastream<const char*> ds( args.data(), args.size() );
+         gapi->call_generic( f, ds ); 
+         return result_type();
+      };
+   }
+
+   /**
+    * It is slightly unclean tight coupling to have this method in the api class.
+    * It breaks encapsulation by requiring an api class method to have a pointer
+    * to an binary_api_connection.  The reason this is necessary is we have a goal of being
+    * able to call register_api() on an api<T> through its base class api_base.  But
+    * register_api() must know the template parameters!
+    *
+    * The only reasonable way to achieve the goal is to implement register_api()
+    * as a method in api<T> (which obviously knows the template parameter T),
+    * then make the implementation accessible through the base class (by making
+    * it a pure virtual method in the base class which is overridden by the subclass's
+    * implementation).
+    */
+   template< typename Interface, typename Transform >
+   api_id_type api< Interface, Transform >::register_api( binary_api_connection& conn )const
+   {
+      return conn.register_api( *this );
+   }
+
+   template< typename T >
+   api<T> api_base::as()
+   {
+      // TODO:  this method should probably be const (if it is not too hard)
+      api<T>* maybe_requested_type = dynamic_cast< api<T>* >(this);
+      if( maybe_requested_type != nullptr )
+         return *maybe_requested_type;
+
+      detail::any_api* maybe_any = dynamic_cast< detail::any_api* >(this);
+      FC_ASSERT( maybe_any != nullptr );
+      std::shared_ptr< binary_api_connection > api_conn = maybe_any->_binary_api_connection.lock();
+      FC_ASSERT( api_conn );
+      return api_conn->get_remote_api<T>( maybe_any->_api_id );
+   }
+
+   namespace detail {
+      template<typename Signature>
+      template<typename... Args> 
+      typename callback_functor<Signature>::result_type callback_functor<Signature>::operator()( Args... args )const
+      {
+         std::shared_ptr< fc::binary_api_connection > locked = _binary_api_connection.lock();
+         // TODO:  make new exception type for this instead of recycling eof_exception
+         if( !locked )
+            throw fc::eof_exception();
+
+         /// TODO------------->>> pack args... 
+         locked->send_callback( _callback_id, fc::raw::pack( args... ) ).template as< result_type >();
+      }
+
+
+      template<typename... Args>
+      class callback_functor<void(Args...)>
+      {
+         public:
+          typedef void result_type;
+
+          callback_functor( std::weak_ptr< fc::binary_api_connection > con, uint64_t id )
+          :_callback_id(id),_binary_api_connection(con){}
+
+          void operator()( Args... args )const
+          {
+             std::shared_ptr< fc::binary_api_connection > locked = _binary_api_connection.lock();
+             // TODO:  make new exception type for this instead of recycling eof_exception
+             if( !locked )
+                throw fc::eof_exception();
+             locked->send_notice( _callback_id, fc::variants{ args... } );
+          }
+
+         private:
+          uint64_t _callback_id;
+          std::weak_ptr< fc::binary_api_connection > _binary_api_connection;
+      };
+   } // namespace detail
+
+} // fc

From f3e69d81a9596250123c53fc4deaf4eb827360fa Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Thu, 11 Aug 2016 11:53:43 -0400
Subject: [PATCH 027/108] sha256:  Implement and test clz(), approx_log_32()

---
 CMakeLists.txt               |  3 ++
 include/fc/crypto/sha256.hpp | 22 +++++++++++--
 src/crypto/sha256.cpp        | 60 +++++++++++++++++++++++++++++++++++-
 tests/crypto/log_test.cpp    | 43 ++++++++++++++++++++++++++
 tests/crypto/log_test.py     | 29 +++++++++++++++++
 5 files changed, 153 insertions(+), 4 deletions(-)
 create mode 100644 tests/crypto/log_test.cpp
 create mode 100755 tests/crypto/log_test.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b53146f..3db7c86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,6 +382,9 @@ target_link_libraries( udt_client fc udt )
 add_executable( ecc_test tests/crypto/ecc_test.cpp )
 target_link_libraries( ecc_test fc )
 
+add_executable( log_test tests/crypto/log_test.cpp )
+target_link_libraries( log_test fc )
+
 #add_executable( test_aes tests/aes_test.cpp )
 #target_link_libraries( test_aes fc ${rt_library} ${pthread_library} )
 #add_executable( test_sleep tests/sleep.cpp )
diff --git a/include/fc/crypto/sha256.hpp b/include/fc/crypto/sha256.hpp
index 87fffa2..2af8a00 100644
--- a/include/fc/crypto/sha256.hpp
+++ b/include/fc/crypto/sha256.hpp
@@ -68,15 +68,31 @@ class sha256
     friend bool   operator >  ( const sha256& h1, const sha256& h2 ); 
     friend bool   operator <  ( const sha256& h1, const sha256& h2 ); 
 
-    uint32_t pop_count()
+    uint32_t pop_count()const
     {
        return (uint32_t)(__builtin_popcountll(_hash[0]) +
                          __builtin_popcountll(_hash[1]) +
                          __builtin_popcountll(_hash[2]) +
                          __builtin_popcountll(_hash[3])); 
     }
-                             
-    uint64_t _hash[4]; 
+
+    /**
+     * Count leading zero bits
+     */
+    uint16_t clz()const;
+
+    /**
+     * Approximate (log_2(x) + 1) * 2**24.
+     *
+     * Detailed specs:
+     * - Return 0 when x == 0.
+     * - High 8 bits of result simply counts nonzero bits.
+     * - Low 24 bits of result are the 24 bits of input immediately after the most significant 1 in the input.
+     * - If above would require reading beyond the end of the input, zeros are used instead.
+     */
+    uint32_t approx_log_32()const;
+
+    uint64_t _hash[4];
 };
 
   typedef sha256 uint256;
diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp
index 9c3b9e6..86bd014 100644
--- a/src/crypto/sha256.cpp
+++ b/src/crypto/sha256.cpp
@@ -97,7 +97,65 @@ namespace fc {
     bool operator == ( const sha256& h1, const sha256& h2 ) {
       return memcmp( h1._hash, h2._hash, sizeof(h1._hash) ) == 0;
     }
-  
+
+   uint32_t sha256::approx_log_32()const
+   {
+      uint16_t lzbits = clz();
+      if( lzbits >= 0x100 )
+         return 0;
+      uint8_t nzbits = 0xFF-lzbits;
+      size_t offset = (size_t) (lzbits >> 3);
+      uint8_t* my_bytes = (uint8_t*) data();
+      size_t n = data_size();
+      uint32_t y = (uint32_t(               my_bytes[offset  ]    ) << 0x18)
+                 | (uint32_t(offset+1 < n ? my_bytes[offset+1] : 0) << 0x10)
+                 | (uint32_t(offset+2 < n ? my_bytes[offset+2] : 0) << 0x08)
+                 | (uint32_t(offset+3 < n ? my_bytes[offset+3] : 0)        )
+                 ;
+      //
+      // lzbits&7 == 7 : 00000001 iff nzbits&7 == 0
+      // lzbits&7 == 6 : 0000001x iff nzbits&7 == 1
+      // lzbits&7 == 5 : 000001xx iff nzbits&7 == 2
+      //
+      y >>= (nzbits & 7);
+      y ^= 1 << 0x18;
+      y |= uint32_t( nzbits ) << 0x18;
+      return y;
+   }
+
+   uint16_t sha256::clz()const
+   {
+      const uint8_t* my_bytes = (uint8_t*) data();
+      size_t size = data_size();
+      size_t lzbits = 0;
+      static const uint8_t char2lzbits[] = {
+     // 0  1  2  3  4  5  6  7  8  9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
+        8, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+       };
+
+      size_t i = 0;
+
+      while( true )
+      {
+         uint8_t c = my_bytes[i];
+         lzbits += char2lzbits[c];
+         if( c != 0 )
+            break;
+         ++i;
+         if( i >= size )
+            return 0x100;
+      }
+
+      return lzbits;
+   }
+
   void to_variant( const sha256& bi, variant& v )
   {
      v = std::vector<char>( (const char*)&bi, ((const char*)&bi) + sizeof(bi) );
diff --git a/tests/crypto/log_test.cpp b/tests/crypto/log_test.cpp
new file mode 100644
index 0000000..ca9621b
--- /dev/null
+++ b/tests/crypto/log_test.cpp
@@ -0,0 +1,43 @@
+
+#include <fc/crypto/sha256.hpp>
+#include <fc/exception/exception.hpp>
+
+#include <fstream>
+#include <iostream>
+
+int main(int argc, char**argv, char** envp)
+{
+   std::ifstream infile("log_test.txt");
+   uint32_t ref_clz;
+   std::string str_h;
+   uint32_t ref_log;
+   uint32_t cases = 0;
+   uint32_t errors = 0;
+
+   while( true )
+   {
+      if( !(infile >> std::hex >> ref_clz) )
+         break;
+      if( !(infile >> str_h) )
+         break;
+      if( !(infile >> std::hex >> ref_log) )
+         break;
+      fc::sha256 h(str_h);
+      if( ref_clz != h.clz() )
+      {
+         std::cerr << "got error on clz(" << str_h << ")" << std::endl;
+         ++errors;
+      }
+      if( ref_log != h.approx_log_32() )
+      {
+         std::cerr << "got error on log(" << str_h << ")" << std::endl;
+         ++errors;
+      }
+      ++cases;
+   }
+
+   std::cerr << "sha256_log_test checked " << cases << " cases, got " << errors << " errors" << std::endl;
+   if( errors )
+      return 1;
+   return 0;
+}
diff --git a/tests/crypto/log_test.py b/tests/crypto/log_test.py
new file mode 100755
index 0000000..ec5c7fe
--- /dev/null
+++ b/tests/crypto/log_test.py
@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+# Independent implementation of algorithm
+# To create log_test.txt, run ./log_test.py > log_test.txt
+
+import random
+
+rand = random.Random(1234)
+
+result = set()
+
+result.add((0, 256))
+result.add(((1 << 256)-1, 0))
+for i in range(256):
+    y = (1 << i)
+    result.add((y, 255-i))
+    for j in range(32):
+        result.add((y+rand.randrange(0, y), 255-i))
+
+def get_sem_32(y):
+    bs = "{:0256b}".format(y)
+    if "1" not in bs:
+        return 0
+    bs += 32*"0"
+    i = bs.index("1")
+    return ((255-i) << 24) | int(bs[i+1:i+25], 2)
+
+for y, lz in sorted(result):
+    print("{:02x}".format(lz), "{:064x}".format(y), "{:08x}".format(get_sem_32(y)))

From 894d784523a7c7312dfd04f381c792378836e132 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 12 Aug 2016 15:23:17 -0400
Subject: [PATCH 028/108] api_connection.hpp: Rename member variable api ->
 _api to avoid conflicting with type name

---
 include/fc/rpc/api_connection.hpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/fc/rpc/api_connection.hpp b/include/fc/rpc/api_connection.hpp
index 44fc7c3..c2268ea 100644
--- a/include/fc/rpc/api_connection.hpp
+++ b/include/fc/rpc/api_connection.hpp
@@ -168,7 +168,7 @@ namespace fc {
 
          struct api_visitor
          {
-            api_visitor( generic_api& a, const std::weak_ptr<fc::api_connection>& s ):api(a),_api_con(s){ }
+            api_visitor( generic_api& a, const std::weak_ptr<fc::api_connection>& s ):_api(a),_api_con(s){ }
 
             template<typename Interface, typename Adaptor, typename ... Args>
             std::function<variant(const fc::variants&)> to_generic( const std::function<api<Interface,Adaptor>(Args...)>& f )const;
@@ -187,11 +187,11 @@ namespace fc {
 
             template<typename Result, typename... Args>
             void operator()( const char* name, std::function<Result(Args...)>& memb )const {
-               api._methods.emplace_back( to_generic( memb ) ); 
-               api._by_name[name] = api._methods.size() - 1;
+               _api._methods.emplace_back( to_generic( memb ) );
+               _api._by_name[name] = _api._methods.size() - 1;
             }
 
-            generic_api&  api;
+            generic_api& _api;
             const std::weak_ptr<fc::api_connection>& _api_con;
          };
 
@@ -382,7 +382,7 @@ namespace fc {
                                                const std::function<fc::api<Interface,Adaptor>(Args...)>& f )const
    {
       auto api_con = _api_con;
-      auto gapi = &api;
+      auto gapi = &_api;
       return [=]( const variants& args ) { 
          auto con = api_con.lock();
          FC_ASSERT( con, "not connected" );
@@ -396,7 +396,7 @@ namespace fc {
                                                const std::function<fc::optional<fc::api<Interface,Adaptor>>(Args...)>& f )const
    {
       auto api_con = _api_con;
-      auto gapi = &api;
+      auto gapi = &_api;
       return [=]( const variants& args )-> fc::variant { 
          auto con = api_con.lock();
          FC_ASSERT( con, "not connected" );
@@ -413,7 +413,7 @@ namespace fc {
                                                const std::function<fc::api_ptr(Args...)>& f )const
    {
       auto api_con = _api_con;
-      auto gapi = &api;
+      auto gapi = &_api;
       return [=]( const variants& args ) -> fc::variant {
          auto con = api_con.lock();
          FC_ASSERT( con, "not connected" );
@@ -428,7 +428,7 @@ namespace fc {
    template<typename R, typename ... Args>
    std::function<variant(const fc::variants&)> generic_api::api_visitor::to_generic( const std::function<R(Args...)>& f )const
    {
-      generic_api* gapi = &api;
+      generic_api* gapi = &_api;
       return [f,gapi]( const variants& args ) { 
          return variant( gapi->call_generic( f, args.begin(), args.end() ) ); 
       };
@@ -437,7 +437,7 @@ namespace fc {
    template<typename ... Args>
    std::function<variant(const fc::variants&)> generic_api::api_visitor::to_generic( const std::function<void(Args...)>& f )const
    {
-      generic_api* gapi = &api;
+      generic_api* gapi = &_api;
       return [f,gapi]( const variants& args ) { 
          gapi->call_generic( f, args.begin(), args.end() ); 
          return variant();

From a7376ceba2e3ea501448f8df422d32ae8646b80d Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Tue, 16 Aug 2016 14:51:50 -0400
Subject: [PATCH 029/108] tcp_socket.cpp: More verbose error message

---
 src/network/tcp_socket.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/network/tcp_socket.cpp b/src/network/tcp_socket.cpp
index 7eee2ab..1c980fc 100644
--- a/src/network/tcp_socket.cpp
+++ b/src/network/tcp_socket.cpp
@@ -154,12 +154,12 @@ namespace fc {
   {
     try
     {
-      my->_sock.bind(boost::asio::ip::tcp::endpoint(boost::asio::ip::address_v4(local_endpoint.get_address()), 
+      my->_sock.bind(boost::asio::ip::tcp::endpoint(boost::asio::ip::address_v4(local_endpoint.get_address()),
                                                                                 local_endpoint.port()));
     }
     catch (const std::exception& except)
     {
-      elog("Exception binding outgoing connection to desired local endpoint: ${what}", ("what", except.what()));
+      elog("Exception binding outgoing connection to desired local endpoint ${endpoint}: ${what}", ("endpoint", local_endpoint)("what", except.what()));
       FC_THROW("error binding to ${endpoint}: ${what}", ("endpoint", local_endpoint)("what", except.what()));
     }
   }

From 8d99ea94e60602f6a79ec113ef7bbc7cfa0ea80e Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 26 Aug 2016 14:57:40 -0400
Subject: [PATCH 030/108] Avoid undefined behavior in enum deserialization

atoi() has undefined behavior when given a string that can't be parsed as an integer.
This patch replaces atoi() with boost_lexical_cast() and throws an exception when we get
something that's not a number.
---
 include/fc/reflect/reflect.hpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/fc/reflect/reflect.hpp b/include/fc/reflect/reflect.hpp
index 4deea27..044d77c 100644
--- a/include/fc/reflect/reflect.hpp
+++ b/include/fc/reflect/reflect.hpp
@@ -7,6 +7,7 @@
  */
 
 #include <fc/utility.hpp>
+#include <boost/lexical_cast.hpp>
 #include <boost/preprocessor/seq/for_each.hpp>
 #include <boost/preprocessor/seq/enum.hpp>
 #include <boost/preprocessor/seq/size.hpp>
@@ -148,7 +149,16 @@ template<> struct reflector<ENUM> { \
     } \
     static ENUM from_string( const char* s ) { \
         BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_ENUM_FROM_STRING, ENUM, FIELDS ) \
-        return ENUM(atoi(s));\
+        int64_t i; \
+        try \
+        { \
+           i = boost::lexical_cast<int64_t>(s); \
+        } \
+        catch( const boost::bad_lexical_cast& e ) \
+        { \
+           fc::throw_bad_enum_cast( s, BOOST_PP_STRINGIZE(ENUM) ); \
+        } \
+        return ENUM(i);\
     } \
 };  \
 }

From 80b2341e775ad659b4407af6c5eae9fc285fb7c8 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 26 Aug 2016 15:29:15 -0400
Subject: [PATCH 031/108] Throw when parsing a string as enum if the string
 parses as integer but does not exist in enum

---
 include/fc/reflect/reflect.hpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/include/fc/reflect/reflect.hpp b/include/fc/reflect/reflect.hpp
index 044d77c..daab9c5 100644
--- a/include/fc/reflect/reflect.hpp
+++ b/include/fc/reflect/reflect.hpp
@@ -120,7 +120,8 @@ void fc::reflector<TYPE>::visit( const Visitor& v ) { \
 
 #define FC_REFLECT_ENUM_FROM_STRING( r, enum_type, elem ) \
   if( strcmp( s, BOOST_PP_STRINGIZE(elem)  ) == 0 ) return enum_type::elem;
-
+#define FC_REFLECT_ENUM_FROM_STRING_CASE( r, enum_type, elem ) \
+   case enum_type::elem:
 
 #define FC_REFLECT_ENUM( ENUM, FIELDS ) \
 namespace fc { \
@@ -158,7 +159,15 @@ template<> struct reflector<ENUM> { \
         { \
            fc::throw_bad_enum_cast( s, BOOST_PP_STRINGIZE(ENUM) ); \
         } \
-        return ENUM(i);\
+        ENUM e = ENUM(i); \
+        switch( e ) \
+        { \
+          BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_ENUM_FROM_STRING_CASE, ENUM, FIELDS ) \
+            break; \
+          default: \
+            fc::throw_bad_enum_cast( s, BOOST_PP_STRINGIZE(ENUM) ); \
+        } \
+        return e;\
     } \
 };  \
 }

From 21d62f0a96b7c01fb1c19fc49ca38bafbf665a29 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 26 Aug 2016 16:27:16 -0400
Subject: [PATCH 032/108] Throw when deserializing an integer into a value not
 in enum

---
 include/fc/reflect/reflect.hpp | 21 ++++++++++++---------
 include/fc/reflect/variant.hpp |  4 ++--
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/include/fc/reflect/reflect.hpp b/include/fc/reflect/reflect.hpp
index daab9c5..075ce80 100644
--- a/include/fc/reflect/reflect.hpp
+++ b/include/fc/reflect/reflect.hpp
@@ -148,6 +148,17 @@ template<> struct reflector<ENUM> { \
     static fc::string to_fc_string(int64_t i) { \
       return to_fc_string(ENUM(i)); \
     } \
+    static ENUM from_int(int64_t i) { \
+      ENUM e = ENUM(i); \
+      switch( e ) \
+      { \
+        BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_ENUM_FROM_STRING_CASE, ENUM, FIELDS ) \
+          break; \
+        default: \
+          fc::throw_bad_enum_cast( i, BOOST_PP_STRINGIZE(ENUM) ); \
+      } \
+      return e;\
+    } \
     static ENUM from_string( const char* s ) { \
         BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_ENUM_FROM_STRING, ENUM, FIELDS ) \
         int64_t i; \
@@ -159,15 +170,7 @@ template<> struct reflector<ENUM> { \
         { \
            fc::throw_bad_enum_cast( s, BOOST_PP_STRINGIZE(ENUM) ); \
         } \
-        ENUM e = ENUM(i); \
-        switch( e ) \
-        { \
-          BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_ENUM_FROM_STRING_CASE, ENUM, FIELDS ) \
-            break; \
-          default: \
-            fc::throw_bad_enum_cast( s, BOOST_PP_STRINGIZE(ENUM) ); \
-        } \
-        return e;\
+        return from_int(i); \
     } \
 };  \
 }
diff --git a/include/fc/reflect/variant.hpp b/include/fc/reflect/variant.hpp
index f48fe9a..31bbbdf 100644
--- a/include/fc/reflect/variant.hpp
+++ b/include/fc/reflect/variant.hpp
@@ -88,8 +88,8 @@ namespace fc
        { 
            if( v.is_string() )
               o = fc::reflector<T>::from_string( v.get_string().c_str() );
-           else 
-              o = static_cast<T>(v.as_int64());
+           else
+              o = fc::reflector<T>::from_int( v.as_int64() );
        }
     };
 

From 360d86da80b79445fa43b29369d918d1fd5759ac Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Mon, 29 Aug 2016 13:11:37 -0400
Subject: [PATCH 033/108] Fix uninitialized variable warning

---
 include/fc/reflect/reflect.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/fc/reflect/reflect.hpp b/include/fc/reflect/reflect.hpp
index 075ce80..c9f5405 100644
--- a/include/fc/reflect/reflect.hpp
+++ b/include/fc/reflect/reflect.hpp
@@ -161,7 +161,7 @@ template<> struct reflector<ENUM> { \
     } \
     static ENUM from_string( const char* s ) { \
         BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_ENUM_FROM_STRING, ENUM, FIELDS ) \
-        int64_t i; \
+        int64_t i = 0; \
         try \
         { \
            i = boost::lexical_cast<int64_t>(s); \

From 19d41b860676959e2014dd34700209df49eb62c4 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 2 Sep 2016 10:36:11 -0400
Subject: [PATCH 034/108] Do not emit \a escape sequence

---
 src/io/json.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/io/json.cpp b/src/io/json.cpp
index 787d08a..a53b3a5 100644
--- a/src/io/json.cpp
+++ b/src/io/json.cpp
@@ -517,9 +517,6 @@ namespace fc
       {
          switch( *itr )
          {
-            case '\a':        // \x07
-               os << "\\a";
-               break;
             case '\b':        // \x08
                os << "\\b";
                break;
@@ -548,7 +545,7 @@ namespace fc
             case '\x04': os << "\\u0004"; break;
             case '\x05': os << "\\u0005"; break;
             case '\x06': os << "\\u0006"; break;
-         // case '\x07': os << "\\u0007"; break; // \a
+            case '\x07': os << "\\u0007"; break; // \a is not valid JSON
          // case '\x08': os << "\\u0008"; break; // \b
          // case '\x09': os << "\\u0009"; break; // \t
          // case '\x0a': os << "\\u000a"; break; // \n

From f59a51625690d40b9bf481c1f8b158434e9ca88e Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Wed, 14 Sep 2016 10:30:48 -0400
Subject: [PATCH 035/108] define to/from variant for boost interprocess deque
 and vector

---
 include/fc/interprocess/container.hpp | 54 +++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 include/fc/interprocess/container.hpp

diff --git a/include/fc/interprocess/container.hpp b/include/fc/interprocess/container.hpp
new file mode 100644
index 0000000..27359fc
--- /dev/null
+++ b/include/fc/interprocess/container.hpp
@@ -0,0 +1,54 @@
+#pragma once
+
+#include <fc/io/raw.hpp>
+#include <fc/variant.hpp>
+
+#include <boost/interprocess/allocators/allocator.hpp>
+#include <boost/interprocess/containers/string.hpp>
+#include <boost/interprocess/containers/vector.hpp>
+#include <boost/interprocess/containers/map.hpp>
+#include <boost/interprocess/containers/deque.hpp>
+
+
+namespace fc {
+
+   namespace bip = boost::interprocess;
+
+    template<typename... T >
+    void to_variant( const bip::deque< T... >& t, fc::variant& v ) {
+      std::vector<variant> vars(t.size());
+      for( size_t i = 0; i < t.size(); ++i ) {
+         vars[i] = t[i];
+      }
+      v = std::move(vars);
+    }
+
+    template<typename T, typename... A>
+    void from_variant( const fc::variant& v, bip::deque< T, A... >& d ) {
+      const variants& vars = v.get_array();
+      d.clear();
+      d.resize( vars.size() );
+      for( uint32_t i = 0; i < vars.size(); ++i ) {
+         from_variant( vars[i], d[i] );
+      }
+    }
+
+    template<typename... T >
+    void to_variant( const bip::vector< T... >& t, fc::variant& v ) {
+      std::vector<variant> vars(t.size());
+      for( size_t i = 0; i < t.size(); ++i ) {
+         vars[i] = t[i];
+      }
+      v = std::move(vars);
+    }
+
+    template<typename T, typename... A>
+    void from_variant( const fc::variant& v, bip::vector< T, A... >& d ) {
+      const variants& vars = v.get_array();
+      d.clear();
+      d.resize( vars.size() );
+      for( uint32_t i = 0; i < vars.size(); ++i ) {
+         from_variant( vars[i], d[i] );
+      }
+    }
+}

From e7d0d26fe2e6559400771efa989f87a6d5d5391e Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Thu, 15 Sep 2016 15:27:50 -0400
Subject: [PATCH 036/108] adding fixed_string definition

---
 include/fc/array.hpp              |   4 +
 include/fc/container/flat.hpp     |  16 +--
 include/fc/container/flat_fwd.hpp |   8 +-
 include/fc/fixed_string.hpp       | 159 ++++++++++++++++++++++++++++++
 include/fc/io/raw_fwd.hpp         |  11 ++-
 include/fc/variant.hpp            |   8 +-
 src/thread/context.hpp            |  42 ++++++--
 src/thread/thread_d.hpp           |  36 ++++++-
 tests/network/ntp_test.cpp        |   5 +
 9 files changed, 261 insertions(+), 28 deletions(-)
 create mode 100644 include/fc/fixed_string.hpp

diff --git a/include/fc/array.hpp b/include/fc/array.hpp
index 6a2053c..226d199 100644
--- a/include/fc/array.hpp
+++ b/include/fc/array.hpp
@@ -20,6 +20,10 @@ namespace fc {
     T&       at( size_t pos )      { assert( pos < N); return data[pos]; }
     const T& at( size_t pos )const { assert( pos < N); return data[pos]; }
     ///@}
+
+    T&       operator[]( size_t pos )      { assert( pos < N); return data[pos]; }
+    const T& operator[]( size_t pos )const { assert( pos < N); return data[pos]; }
+
     
     T*           begin()       {  return &data[0]; }
     const T*     begin()const  {  return &data[0]; }
diff --git a/include/fc/container/flat.hpp b/include/fc/container/flat.hpp
index 8fe606a..0888d0b 100644
--- a/include/fc/container/flat.hpp
+++ b/include/fc/container/flat.hpp
@@ -30,8 +30,8 @@ namespace fc {
              value.insert( std::move(tmp) );
          }
        }
-       template<typename Stream, typename K, typename V>
-       inline void pack( Stream& s, const flat_map<K,V>& value ) {
+       template<typename Stream, typename K, typename... V>
+       inline void pack( Stream& s, const flat_map<K,V...>& value ) {
          pack( s, unsigned_int((uint32_t)value.size()) );
          auto itr = value.begin();
          auto end = value.end();
@@ -40,8 +40,8 @@ namespace fc {
            ++itr;
          }
        }
-       template<typename Stream, typename K, typename V>
-       inline void unpack( Stream& s, flat_map<K,V>& value ) 
+       template<typename Stream, typename K, typename V, typename... A>
+       inline void unpack( Stream& s, flat_map<K,V,A...>& value ) 
        {
          unsigned_int size; unpack( s, size );
          value.clear();
@@ -76,8 +76,8 @@ namespace fc {
          vo.insert( itr->as<T>() );
    }
 
-   template<typename K, typename T>
-   void to_variant( const flat_map<K, T>& var,  variant& vo )
+   template<typename K, typename... T>
+   void to_variant( const flat_map<K, T...>& var,  variant& vo )
    {
        std::vector< variant > vars(var.size());
        size_t i = 0;
@@ -85,8 +85,8 @@ namespace fc {
           vars[i] = fc::variant(*itr);
        vo = vars;
    }
-   template<typename K, typename T>
-   void from_variant( const variant& var,  flat_map<K, T>& vo )
+   template<typename K, typename T, typename... A>
+   void from_variant( const variant& var,  flat_map<K, T, A...>& vo )
    {
       const variants& vars = var.get_array();
       vo.clear();
diff --git a/include/fc/container/flat_fwd.hpp b/include/fc/container/flat_fwd.hpp
index 999a976..9f3ef4f 100644
--- a/include/fc/container/flat_fwd.hpp
+++ b/include/fc/container/flat_fwd.hpp
@@ -12,10 +12,10 @@ namespace fc {
        void pack( Stream& s, const flat_set<T>& value );
        template<typename Stream, typename T>
        void unpack( Stream& s, flat_set<T>& value );
-       template<typename Stream, typename K, typename V>
-       void pack( Stream& s, const flat_map<K,V>& value );
-       template<typename Stream, typename K, typename V>
-       void unpack( Stream& s, flat_map<K,V>& value ) ;
+       template<typename Stream, typename K, typename... V>
+       void pack( Stream& s, const flat_map<K,V...>& value );
+       template<typename Stream, typename K, typename... V>
+       void unpack( Stream& s, flat_map<K,V...>& value ) ;
    } // namespace raw
 
 } // fc
diff --git a/include/fc/fixed_string.hpp b/include/fc/fixed_string.hpp
new file mode 100644
index 0000000..ddb8ee9
--- /dev/null
+++ b/include/fc/fixed_string.hpp
@@ -0,0 +1,159 @@
+#pragma once
+#include <fc/io/raw_fwd.hpp>
+#include <boost/multiprecision/cpp_int.hpp>
+
+
+namespace fc {
+    typedef boost::multiprecision::uint128_t  m128;
+
+
+   /**
+    *  This class is designed to offer in-place memory allocation of a string up to Length equal to
+    *  sizeof(Storage).  
+    *
+    *  The string will serialize the same way as std::string for variant and raw formats
+    *  The string will sort according to the comparison operators defined for Storage, this enables effecient
+    *  sorting.
+    */
+   template<typename Storage = std::pair<uint64_t,uint64_t> >
+   class fixed_string {
+      public:
+         fixed_string(){}
+         fixed_string( const fixed_string& c ):data(c.data){}
+
+         fixed_string( const std::string& str ) {
+            if( str.size() <= sizeof(data) )
+               memcpy( (char*)&data, str.c_str(), str.size() );
+            else {
+               wlog( "truncating string '${str}'", ("str",str) );
+               memcpy( (char*)&data, str.c_str(), sizeof(data) );
+            }
+         }
+         fixed_string( const char* str ) {
+            int l = strlen(str);
+            if( l <= sizeof(data) )
+               memcpy( (char*)&data, str, l );
+            else {
+               wlog( "truncating string '${str}'", ("str",str) );
+               memcpy( (char*)&data, str, sizeof(data) );
+            }
+         }
+
+         operator std::string()const { 
+            const char* self = (const char*)&data;
+            return std::string( self, self + size() );
+         }
+
+         uint32_t size()const {
+            if( *(((const char*)&data)+sizeof(data) - 1) )
+               return sizeof(data);
+            return strnlen( (const char*)&data, sizeof(data) );
+         }
+         uint32_t length()const { return size(); }
+
+         fixed_string& operator=( const fixed_string& str ) {
+            data = str.data;
+            return *this;
+         }
+         fixed_string& operator=( const char* str ) {
+            return *this = fixed_string(str);
+         }
+
+         fixed_string& operator=( const std::string& str ) {
+            if( str.size() <= sizeof(data) ) {
+               data = Storage();
+               memcpy( (char*)&data, str.c_str(), str.size() );
+            }
+            else {
+               wlog( "truncating string '${str}'", ("str",str) );
+               memcpy( (char*)&data, str.c_str(), sizeof(data) );
+            }
+            return *this;
+         }
+
+         friend std::string operator + ( const fixed_string& a, const std::string& b ) {
+            return std::string(a) + b;
+         }
+         friend std::string operator + ( const std::string& a, const fixed_string& b ) {
+            return a + std::string(b);
+         }
+
+         friend bool operator < ( const fixed_string& a, const fixed_string& b ) {
+            return a.data < b.data;
+         }
+         friend bool operator <= ( const fixed_string& a, const fixed_string& b ) {
+            return a.data <= b.data;
+         }
+         friend bool operator > ( const fixed_string& a, const fixed_string& b ) {
+            return a.data > b.data;
+         }
+         friend bool operator >= ( const fixed_string& a, const fixed_string& b ) {
+            return a.data >= b.data;
+         }
+         friend bool operator == ( const fixed_string& a, const fixed_string& b ) {
+            return a.data == b.data;
+         }
+         friend bool operator != ( const fixed_string& a, const fixed_string& b ) {
+            return a.data != b.data;
+         }
+      //private:
+         Storage data;
+   };
+
+  namespace raw
+  {
+    template<typename Stream, typename Storage>
+    inline void pack( Stream& s, const fc::fixed_string<Storage>& u ) { 
+       unsigned_int size = u.size();
+       pack( s, size );
+       s.write( (const char*)&u.data, size );
+    }
+
+    template<typename Stream, typename Storage>
+    inline void unpack( Stream& s, fc::fixed_string<Storage>& u ) { 
+       unsigned_int size; 
+       fc::raw::unpack( s, size );
+       if( size.value > 0 ) {
+          if( size.value > sizeof(Storage) ) {
+             s.read( (char*)&u.data, sizeof(Storage) );
+             s.skip( size.value - sizeof(Storage) );
+
+             /*
+             s.seekp( s.tellp() + (size.value - sizeof(Storage)) );
+             char tmp;
+             size.value -= sizeof(storage);
+             while( size.value ){ s.read( &tmp, 1 ); --size.value; }
+             */
+           //  s.skip( size.value - sizeof(Storage) );
+          } else {
+             s.read( (char*)&u.data, size.value );
+          }
+       }
+    }
+
+    /*
+    template<typename Stream, typename... Args>
+    inline void pack( Stream& s, const boost::multiprecision::number<Args...>& d ) {
+       s.write( (const char*)&d, sizeof(d) );
+    }
+
+    template<typename Stream, typename... Args>
+    inline void unpack( Stream& s, boost::multiprecision::number<Args...>& u ) { 
+       s.read( (const char*)&u, sizeof(u) );
+    }
+    */
+  }
+}
+
+#include <fc/variant.hpp>
+namespace fc {
+   template<typename Storage>
+   void to_variant( const fixed_string<Storage>& s, variant& v ) {
+      v = std::string(s);
+   }
+
+   template<typename Storage>
+   void from_variant( const variant& v, fixed_string<Storage>& s ) {
+      s = v.as_string();
+   }
+}
diff --git a/include/fc/io/raw_fwd.hpp b/include/fc/io/raw_fwd.hpp
index 9192ca3..c98b932 100644
--- a/include/fc/io/raw_fwd.hpp
+++ b/include/fc/io/raw_fwd.hpp
@@ -25,12 +25,19 @@ namespace fc {
    namespace ip { class endpoint; }
 
    namespace ecc { class public_key; class private_key; }
+   template<typename Storage> class fixed_string;
+
    namespace raw {
+    template<typename Stream, typename Storage> inline void pack( Stream& s, const fc::fixed_string<Storage>& u );
+    template<typename Stream, typename Storage> inline void unpack( Stream& s, fc::fixed_string<Storage>& u );
+
     template<typename Stream, typename IntType, typename EnumType>
     inline void pack( Stream& s, const fc::enum_type<IntType,EnumType>& tp );
     template<typename Stream, typename IntType, typename EnumType>
     inline void unpack( Stream& s, fc::enum_type<IntType,EnumType>& tp );
 
+
+
     template<typename Stream, typename T> inline void pack( Stream& s, const std::set<T>& value );
     template<typename Stream, typename T> inline void unpack( Stream& s, std::set<T>& value );
     template<typename Stream, typename T> inline void pack( Stream& s, const std::unordered_set<T>& value );
@@ -51,8 +58,8 @@ namespace fc {
     template<typename Stream, typename K, typename V> inline void pack( Stream& s, const std::map<K,V>& value );
     template<typename Stream, typename K, typename V> inline void unpack( Stream& s, std::map<K,V>& value );
 
-    template<typename Stream, typename K, typename V> inline void pack( Stream& s, const flat_map<K,V>& value );
-    template<typename Stream, typename K, typename V> inline void unpack( Stream& s, flat_map<K,V>& value );
+    template<typename Stream, typename K, typename... V> inline void pack( Stream& s, const flat_map<K,V...>& value );
+    template<typename Stream, typename K, typename V, typename... A> inline void unpack( Stream& s, flat_map<K,V,A...>& value );
 
     template<typename Stream, typename K, typename V> inline void pack( Stream& s, const std::pair<K,V>& value );
     template<typename Stream, typename K, typename V> inline void unpack( Stream& s, std::pair<K,V>& value );
diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp
index ebb6934..5c2d3ae 100644
--- a/include/fc/variant.hpp
+++ b/include/fc/variant.hpp
@@ -88,10 +88,10 @@ namespace fc
    template<typename K, typename T>
    void from_variant( const variant& var,  std::unordered_map<K,T>& vo );
 
-   template<typename K, typename T>
-   void to_variant( const fc::flat_map<K,T>& var,  variant& vo );
-   template<typename K, typename T>
-   void from_variant( const variant& var, fc::flat_map<K,T>& vo );
+   template<typename K, typename... T>
+   void to_variant( const fc::flat_map<K,T...>& var,  variant& vo );
+   template<typename K, typename... T>
+   void from_variant( const variant& var, fc::flat_map<K,T...>& vo );
 
    template<typename T>
    void to_variant( const std::map<string,T>& var,  variant& vo );
diff --git a/src/thread/context.hpp b/src/thread/context.hpp
index f6e8a77..31bfbaa 100644
--- a/src/thread/context.hpp
+++ b/src/thread/context.hpp
@@ -4,6 +4,8 @@
 #include <fc/exception/exception.hpp>
 #include <vector>
 
+#include <iostream>
+
 #include <boost/version.hpp>
 
 #if BOOST_VERSION >= 105400
@@ -43,12 +45,17 @@ namespace fc {
   struct context  {
     typedef fc::context* ptr;
 
-#if BOOST_VERSION >= 105400
+#if BOOST_VERSION >= 105400 // && BOOST_VERSION <= 106100 
     bco::stack_context stack_ctx;
 #endif
 
+#if BOOST_VERSION >= 106100 
+    typedef bc::detail::transfer_t transfer_t;
+#else
+    typedef intptr_t transfer_t;
+#endif
 
-    context( void (*sf)(intptr_t), stack_allocator& alloc, fc::thread* t )
+    context( void (*sf)(transfer_t), stack_allocator& alloc, fc::thread* t )
     : caller_context(0),
       stack_alloc(&alloc),
       next_blocked(0), 
@@ -63,7 +70,13 @@ namespace fc {
       cur_task(0),
       context_posted_num(0)
     {
-#if BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 106100
+     //  std::cerr<< "HERE: "<< BOOST_VERSION <<"\n";
+     //my_context = new bc::execution_context<intptr_t>( [=]( bc::execution_context<intptr_t> sink, intptr_t self  ){ std::cerr<<"in ex\n"; sf(self);  std::cerr<<"exit ex\n"; return sink; } );
+     size_t stack_size = FC_CONTEXT_STACK_SIZE;
+     alloc.allocate(stack_ctx, stack_size);
+     my_context = bc::detail::make_fcontext( stack_ctx.sp, stack_ctx.size, sf );
+#elif BOOST_VERSION >= 105600
      size_t stack_size = FC_CONTEXT_STACK_SIZE;
      alloc.allocate(stack_ctx, stack_size);
      my_context = bc::make_fcontext( stack_ctx.sp, stack_ctx.size, sf); 
@@ -84,7 +97,7 @@ namespace fc {
     }
 
     context( fc::thread* t) :
-#if BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 105600 && BOOST_VERSION <= 106100 
      my_context(nullptr),
 #elif BOOST_VERSION >= 105300
      my_context(new bc::fcontext_t),
@@ -102,10 +115,21 @@ namespace fc {
      complete(false),
      cur_task(0),
      context_posted_num(0)
-    {}
+    {
+    
+#if BOOST_VERSION >= 106100
+       /*
+        bc::execution_context<intptr_t> tmp(  [=]( bc::execution_context<intptr_t> sink, intptr_t ) { std::cerr<<"get current\n"; return sink; } );
+        auto result = tmp(0);
+        my_context = new bc::execution_context<intptr_t>( std::move( std::get<0>(result) ) );
+        */
+#endif
+    }
 
     ~context() {
-#if BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 106100
+      // delete my_context;
+#elif BOOST_VERSION >= 105600
       if(stack_alloc)
         stack_alloc->deallocate( stack_ctx );
 #elif BOOST_VERSION >= 105400
@@ -209,7 +233,11 @@ namespace fc {
 
 
 
-#if BOOST_VERSION >= 105300 && BOOST_VERSION < 105600
+
+#if BOOST_VERSION >= 106100 
+    //bc::execution_context<intptr_t>*   my_context;
+    bc::detail::fcontext_t       my_context;
+#elif BOOST_VERSION >= 105300 && BOOST_VERSION < 105600
     bc::fcontext_t*              my_context;
 #else
     bc::fcontext_t               my_context;
diff --git a/src/thread/thread_d.hpp b/src/thread/thread_d.hpp
index 941b2fa..940a280 100644
--- a/src/thread/thread_d.hpp
+++ b/src/thread/thread_d.hpp
@@ -18,6 +18,8 @@ namespace fc {
     class thread_d {
 
         public:
+           fc::context* prev_ctx = nullptr;
+
            thread_d(fc::thread& s)
             :self(s), boost_thread(0),
              task_in_queue(0),
@@ -397,7 +399,12 @@ namespace fc {
                 }
                 // slog( "jump to %p from %p", next, prev );
                 // fc_dlog( logger::get("fc_context"), "from ${from} to ${to}", ( "from", int64_t(prev) )( "to", int64_t(next) ) ); 
-#if BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 106100
+                prev_ctx = prev;
+                std::cerr<<"start jumping to existing context...\n";
+                bc::detail::jump_fcontext( next->my_context, this );
+                std::cerr<<"back from jumping to existing context\n";
+#elif BOOST_VERSION >= 105600
                 bc::jump_fcontext( &prev->my_context, next->my_context, 0 );
 #elif BOOST_VERSION >= 105300
                 bc::jump_fcontext( prev->my_context, next->my_context, 0 );
@@ -439,7 +446,16 @@ namespace fc {
 
                 // slog( "jump to %p from %p", next, prev );
                 // fc_dlog( logger::get("fc_context"), "from ${from} to ${to}", ( "from", int64_t(prev) )( "to", int64_t(next) ) );
-#if BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 106100
+                //(*next->my_context)( (intptr_t)this );
+                //bc::detail::transfer_t tran; tran.data = this;
+                std::cerr << "start prev->my_context = " << prev->my_context <<"... \n";
+                std::cerr << "jumping to next context... \n";
+                prev_ctx = prev;
+                auto result = bc::detail::jump_fcontext( next->my_context, this );
+                std::cerr << "end prev->my_context = " << prev->my_context <<"... \n";
+                std::cerr << result.fctx <<" <--- result \n";
+#elif BOOST_VERSION >= 105600
                 bc::jump_fcontext( &prev->my_context, next->my_context, (intptr_t)this );
 #elif BOOST_VERSION >= 105300
                 bc::jump_fcontext( prev->my_context, next->my_context, (intptr_t)this );
@@ -467,9 +483,22 @@ namespace fc {
               return true;
            }
 
-           static void start_process_tasks( intptr_t my ) 
+           static void start_process_tasks( fc::context::transfer_t my ) 
            {
+#if BOOST_VERSION >= 106100
+              std::cerr<<"my data: "<<my.data<<"\n";
+              std::cerr<<"my from: "<<my.fctx<<"\n";
+              thread_d* self = (thread_d*)my.data;
+              if( self->prev_ctx )
+              {
+                 std::cerr << "setting prev_ctx to " << int64_t(my.fctx) << "\n";
+                 self->prev_ctx->my_context = my.fctx;
+              }
+              std::cerr<<"start process tasks\n" << int64_t(self)<<"\n";
+              assert( self != 0 );
+#else
               thread_d* self = (thread_d*)my;
+#endif
               try 
               {
                 self->process_tasks();
@@ -484,6 +513,7 @@ namespace fc {
               }
               self->free_list.push_back(self->current);
               self->start_next_fiber( false );
+              std::cerr << "existing start process tasks \n ";
            }
 
            void run_next_task() 
diff --git a/tests/network/ntp_test.cpp b/tests/network/ntp_test.cpp
index f0c02d4..957d1e4 100644
--- a/tests/network/ntp_test.cpp
+++ b/tests/network/ntp_test.cpp
@@ -8,6 +8,10 @@ BOOST_AUTO_TEST_SUITE(fc_network)
 
 BOOST_AUTO_TEST_CASE( ntp_test )
 {
+   ilog("start ntp test");
+   fc::usleep( fc::seconds(1) );
+   ilog("done ntp test");
+   /*
    fc::ntp ntp_service;
    ntp_service.set_request_interval(5);
    fc::usleep(fc::seconds(4) );
@@ -20,6 +24,7 @@ BOOST_AUTO_TEST_CASE( ntp_test )
 //   auto seconds = delta.count() / 1000000;
    auto msec= delta.count() / 1000;
    BOOST_CHECK( msec < 100 );
+   */
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 5c5156f3db84e504e126297f32d0e0b58f6a6840 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Fri, 16 Sep 2016 13:31:03 -0400
Subject: [PATCH 037/108] remove multiprecision from fixed_string

---
 include/fc/fixed_string.hpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/include/fc/fixed_string.hpp b/include/fc/fixed_string.hpp
index ddb8ee9..766a2be 100644
--- a/include/fc/fixed_string.hpp
+++ b/include/fc/fixed_string.hpp
@@ -1,10 +1,8 @@
 #pragma once
 #include <fc/io/raw_fwd.hpp>
-#include <boost/multiprecision/cpp_int.hpp>
 
 
 namespace fc {
-    typedef boost::multiprecision::uint128_t  m128;
 
 
    /**

From ddc2c16cdb79bfb87f731b9a3855ef8ee35f6015 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Fri, 16 Sep 2016 14:53:03 -0400
Subject: [PATCH 038/108] removing duplicate definitions given boost::flat_map
 == boost::interprocess::flat_map

---
 include/fc/interprocess/container.hpp | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/include/fc/interprocess/container.hpp b/include/fc/interprocess/container.hpp
index 27359fc..d9b5bfa 100644
--- a/include/fc/interprocess/container.hpp
+++ b/include/fc/interprocess/container.hpp
@@ -7,6 +7,7 @@
 #include <boost/interprocess/containers/string.hpp>
 #include <boost/interprocess/containers/vector.hpp>
 #include <boost/interprocess/containers/map.hpp>
+#include <boost/interprocess/containers/flat_map.hpp>
 #include <boost/interprocess/containers/deque.hpp>
 
 
@@ -33,6 +34,26 @@ namespace fc {
       }
     }
 
+    /*  bip::flat_map == boost::flat_map
+    template<typename K, typename V, typename... T >
+    void to_variant( const bip::flat_map< K, V, T... >& var, fc::variant& vo ) {
+       std::vector< variant > vars(var.size());
+       size_t i = 0;
+       for( auto itr = var.begin(); itr != var.end(); ++itr, ++i )
+          vars[i] = fc::variant(*itr);
+       vo = vars;
+    }
+
+    template<typename K, typename V, typename... A>
+    void from_variant( const variant& var,  bip::flat_map<K, V, A...>& vo )
+    {
+       const variants& vars = var.get_array();
+       vo.clear();
+       for( auto itr = vars.begin(); itr != vars.end(); ++itr )
+          vo.insert( itr->as< std::pair<K,V> >() );
+    }
+    */
+
     template<typename... T >
     void to_variant( const bip::vector< T... >& t, fc::variant& v ) {
       std::vector<variant> vars(t.size());

From 3c6d7d9fe3d4df3f39789f65fc06a06290718a32 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Fri, 16 Sep 2016 17:17:06 -0400
Subject: [PATCH 039/108] remove console spam

---
 include/fc/fixed_string.hpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/fc/fixed_string.hpp b/include/fc/fixed_string.hpp
index 766a2be..b141165 100644
--- a/include/fc/fixed_string.hpp
+++ b/include/fc/fixed_string.hpp
@@ -23,7 +23,6 @@ namespace fc {
             if( str.size() <= sizeof(data) )
                memcpy( (char*)&data, str.c_str(), str.size() );
             else {
-               wlog( "truncating string '${str}'", ("str",str) );
                memcpy( (char*)&data, str.c_str(), sizeof(data) );
             }
          }
@@ -32,7 +31,6 @@ namespace fc {
             if( l <= sizeof(data) )
                memcpy( (char*)&data, str, l );
             else {
-               wlog( "truncating string '${str}'", ("str",str) );
                memcpy( (char*)&data, str, sizeof(data) );
             }
          }
@@ -63,7 +61,6 @@ namespace fc {
                memcpy( (char*)&data, str.c_str(), str.size() );
             }
             else {
-               wlog( "truncating string '${str}'", ("str",str) );
                memcpy( (char*)&data, str.c_str(), sizeof(data) );
             }
             return *this;

From 78b511c11e129fd9009a09ae7c448eed42ac4eef Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Tue, 20 Sep 2016 15:06:00 -0400
Subject: [PATCH 040/108] Fix warning in fixed_string.hpp

---
 include/fc/fixed_string.hpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/fc/fixed_string.hpp b/include/fc/fixed_string.hpp
index b141165..4982838 100644
--- a/include/fc/fixed_string.hpp
+++ b/include/fc/fixed_string.hpp
@@ -7,7 +7,7 @@ namespace fc {
 
    /**
     *  This class is designed to offer in-place memory allocation of a string up to Length equal to
-    *  sizeof(Storage).  
+    *  sizeof(Storage).
     *
     *  The string will serialize the same way as std::string for variant and raw formats
     *  The string will sort according to the comparison operators defined for Storage, this enables effecient
@@ -27,7 +27,7 @@ namespace fc {
             }
          }
          fixed_string( const char* str ) {
-            int l = strlen(str);
+            auto l = strlen(str);
             if( l <= sizeof(data) )
                memcpy( (char*)&data, str, l );
             else {
@@ -35,7 +35,7 @@ namespace fc {
             }
          }
 
-         operator std::string()const { 
+         operator std::string()const {
             const char* self = (const char*)&data;
             return std::string( self, self + size() );
          }
@@ -98,15 +98,15 @@ namespace fc {
   namespace raw
   {
     template<typename Stream, typename Storage>
-    inline void pack( Stream& s, const fc::fixed_string<Storage>& u ) { 
+    inline void pack( Stream& s, const fc::fixed_string<Storage>& u ) {
        unsigned_int size = u.size();
        pack( s, size );
        s.write( (const char*)&u.data, size );
     }
 
     template<typename Stream, typename Storage>
-    inline void unpack( Stream& s, fc::fixed_string<Storage>& u ) { 
-       unsigned_int size; 
+    inline void unpack( Stream& s, fc::fixed_string<Storage>& u ) {
+       unsigned_int size;
        fc::raw::unpack( s, size );
        if( size.value > 0 ) {
           if( size.value > sizeof(Storage) ) {
@@ -133,7 +133,7 @@ namespace fc {
     }
 
     template<typename Stream, typename... Args>
-    inline void unpack( Stream& s, boost::multiprecision::number<Args...>& u ) { 
+    inline void unpack( Stream& s, boost::multiprecision::number<Args...>& u ) {
        s.read( (const char*)&u, sizeof(u) );
     }
     */

From ea78d2e75d3c74cc65e98ff5959627350a982b0f Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 23 Sep 2016 12:19:47 -0400
Subject: [PATCH 041/108] reflect.hpp:  Improve reflection of enum types

- Fix implementation of FC_REFLECT_VISIT_ENUM()
- Re-enable visit() for enum
- Add typename information for enum
---
 include/fc/reflect/reflect.hpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/fc/reflect/reflect.hpp b/include/fc/reflect/reflect.hpp
index c9f5405..45efbe0 100644
--- a/include/fc/reflect/reflect.hpp
+++ b/include/fc/reflect/reflect.hpp
@@ -112,7 +112,7 @@ void fc::reflector<TYPE>::visit( const Visitor& v ) { \
 
 
 #define FC_REFLECT_VISIT_ENUM( r, enum_type, elem ) \
-  v.TEMPLATE operator()<enum_type::elem>(BOOST_PP_STRINGIZE(elem));
+  v.operator()(BOOST_PP_STRINGIZE(elem), int64_t(enum_type::elem) );
 #define FC_REFLECT_ENUM_TO_STRING( r, enum_type, elem ) \
    case enum_type::elem: return BOOST_PP_STRINGIZE(elem);
 #define FC_REFLECT_ENUM_TO_FC_STRING( r, enum_type, elem ) \
@@ -172,7 +172,13 @@ template<> struct reflector<ENUM> { \
         } \
         return from_int(i); \
     } \
+    template< typename Visitor > \
+    static void visit( Visitor& v ) \
+    { \
+        BOOST_PP_SEQ_FOR_EACH( FC_REFLECT_VISIT_ENUM, ENUM, FIELDS ) \
+    } \
 };  \
+template<> struct get_typename<ENUM>  { static const char* name()  { return BOOST_PP_STRINGIZE(ENUM);  } }; \
 }
 
 /*  Note: FC_REFLECT_ENUM previously defined this function, but I don't think it ever

From fb4ddbac0d9d29be5734766727f8f93f8de5776f Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Wed, 28 Sep 2016 11:55:51 -0400
Subject: [PATCH 042/108] addding improved support for serializing boost
 interprocss types

---
 include/fc/container/flat.hpp     | 29 +++++++++++++++++++++++++++++
 include/fc/container/flat_fwd.hpp |  8 ++++++++
 include/fc/variant.hpp            |  6 ++++++
 3 files changed, 43 insertions(+)

diff --git a/include/fc/container/flat.hpp b/include/fc/container/flat.hpp
index 0888d0b..48fdf75 100644
--- a/include/fc/container/flat.hpp
+++ b/include/fc/container/flat.hpp
@@ -54,6 +54,35 @@ namespace fc {
              value.insert( std::move(tmp) );
          }
        }
+
+       template<typename Stream, typename T, typename A>
+       void pack( Stream& s, const bip::vector<T,A>& value ) {
+         pack( s, unsigned_int((uint32_t)value.size()) );
+         if( !std::is_fundamental<T>::value ) {
+            auto itr = value.begin();
+            auto end = value.end();
+            while( itr != end ) {
+              fc::raw::pack( s, *itr );
+              ++itr;
+            }
+         } else {
+             s.write( (const char*)value.data(), value.size() );
+         }
+       }
+
+       template<typename Stream, typename T, typename A>
+       void unpack( Stream& s, bip::vector<T,A>& value ) {
+          unsigned_int size;
+          unpack( s, size );
+          value.resize( size );
+          if( !std::is_fundamental<T>::value ) {
+             for( auto& item : value )
+                unpack( s, item );
+          } else {
+             s.read( (char*)value.data(), value.size() );
+          }
+       }
+
    } // namespace raw
 
 
diff --git a/include/fc/container/flat_fwd.hpp b/include/fc/container/flat_fwd.hpp
index 9f3ef4f..98dd954 100644
--- a/include/fc/container/flat_fwd.hpp
+++ b/include/fc/container/flat_fwd.hpp
@@ -1,11 +1,13 @@
 #pragma once 
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
+#include <boost/interprocess/containers/vector.hpp>
 
 namespace fc {
 
    using boost::container::flat_map;
    using boost::container::flat_set;
+   namespace bip = boost::interprocess;
 
    namespace raw {
        template<typename Stream, typename T>
@@ -16,6 +18,12 @@ namespace fc {
        void pack( Stream& s, const flat_map<K,V...>& value );
        template<typename Stream, typename K, typename... V>
        void unpack( Stream& s, flat_map<K,V...>& value ) ;
+
+
+       template<typename Stream, typename T, typename A>
+       void pack( Stream& s, const bip::vector<T,A>& value );
+       template<typename Stream, typename T, typename A>
+       void unpack( Stream& s, bip::vector<T,A>& value );
    } // namespace raw
 
 } // fc
diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp
index 5c2d3ae..ccb2960 100644
--- a/include/fc/variant.hpp
+++ b/include/fc/variant.hpp
@@ -312,6 +312,12 @@ namespace fc
            return tmp;
         }
 
+        template<typename T>
+        void as( T& v )const
+        {
+           from_variant( *this, v );
+        }
+
         variant& operator=( variant&& v );
         variant& operator=( const variant& v );
 

From f14f46368760cf2cfde7a85e0ed0d16dc8fcf18b Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Mon, 26 Sep 2016 16:05:55 -0400
Subject: [PATCH 043/108] fixed_string.hpp:  Don't use skip() as not all stream
 types support it

---
 include/fc/fixed_string.hpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/fc/fixed_string.hpp b/include/fc/fixed_string.hpp
index 4982838..ca6ea1f 100644
--- a/include/fc/fixed_string.hpp
+++ b/include/fc/fixed_string.hpp
@@ -111,7 +111,14 @@ namespace fc {
        if( size.value > 0 ) {
           if( size.value > sizeof(Storage) ) {
              s.read( (char*)&u.data, sizeof(Storage) );
-             s.skip( size.value - sizeof(Storage) );
+             char buf[1024];
+             size_t left = size.value - sizeof(Storage);
+             while( left >= 1024 )
+             {
+                s.read( buf, 1024 );
+                left -= 1024;
+             }
+             s.read( buf, left );
 
              /*
              s.seekp( s.tellp() + (size.value - sizeof(Storage)) );

From 86e1cb83db45fbeccea6078f7e12e958433e7be6 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Wed, 28 Sep 2016 14:34:57 -0400
Subject: [PATCH 044/108] Link with zlib and bzip2 libraries, if found

These libraries are not required by FC. However, the only way I've found to get CMake to pass them to the linker
in an order which will allow steemd to successfully link, is to put them in FC's CMakeLists.txt.
---
 CMakeLists.txt | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3db7c86..c8da424 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -304,6 +304,31 @@ ELSE()
   ENDIF()
 ENDIF()
 
+IF(APPLE)
+  # As of 10.10 yosemite, the OpenSSL static libraries shipped with os x have a dependency
+  # on zlib, so any time you link in openssl you also need to link zlib.  .  We really want to detect whether openssl was configured with the --no-zlib
+  # option or not when it was built, but that's difficult to do in practice, so we
+  # just always try to link it in on mac.
+  find_package( ZLIB REQUIRED )
+ELSE(APPLE)
+  find_package( ZLIB )
+ENDIF(APPLE)
+
+if( ZLIB_FOUND )
+  MESSAGE( STATUS "zlib found" )
+  add_definitions( -DHAS_ZLIB )
+else()
+  MESSAGE( STATUS "zlib not found" )
+endif( ZLIB_FOUND )
+
+find_package( BZip2 )
+if( BZIP2_FOUND )
+   MESSAGE( STATUS "bzip2 found" )
+   add_definitions( -DHAS_BZIP2 )
+else()
+   MESSAGE( STATUS "bzip2 not found" )
+endif( BZIP2_FOUND )
+
 # This will become unnecessary once we update to websocketpp which fixes upstream issue #395
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBSOCKETPP_STRICT_MASKING")
 
@@ -324,11 +349,11 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
   )
 
-#target_link_libraries( fc PUBLIC udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
+#target_link_libraries( fc PUBLIC udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
 
 if(MSVC)
   set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
@@ -493,14 +518,6 @@ if(WIN32)
 
 endif(WIN32)
 
-IF(APPLE)
-  # As of 10.10 yosemite, the OpenSSL static libraries shipped with os x have a dependency
-  # on zlib, so any time you link in openssl you also need to link zlib.  .  We really want to detect whether openssl was configured with the --no-zlib
-  # option or not when it was built, but that's difficult to do in practice, so we
-  # just always try to link it in on mac.
-  find_package( ZLIB REQUIRED )
-ENDIF(APPLE)
-
 SET(OPENSSL_CONF_TARGET )
 IF(DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   SET (OPENSSL_CONF_TARGET ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})

From fa5d86d82195e3bb2b4e54273eaaa1e2ee5cd9a3 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Wed, 28 Sep 2016 15:55:08 -0400
Subject: [PATCH 045/108] define interprocess vector packing

---
 include/fc/interprocess/container.hpp | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/include/fc/interprocess/container.hpp b/include/fc/interprocess/container.hpp
index d9b5bfa..32f6a95 100644
--- a/include/fc/interprocess/container.hpp
+++ b/include/fc/interprocess/container.hpp
@@ -1,14 +1,13 @@
 #pragma once
 
-#include <fc/io/raw.hpp>
 #include <fc/variant.hpp>
-
 #include <boost/interprocess/allocators/allocator.hpp>
 #include <boost/interprocess/containers/string.hpp>
 #include <boost/interprocess/containers/vector.hpp>
 #include <boost/interprocess/containers/map.hpp>
 #include <boost/interprocess/containers/flat_map.hpp>
 #include <boost/interprocess/containers/deque.hpp>
+#include <fc/io/raw_fwd.hpp>
 
 
 namespace fc {
@@ -72,4 +71,27 @@ namespace fc {
          from_variant( vars[i], d[i] );
       }
     }
+
+   namespace raw {
+       namespace bip = boost::interprocess;
+
+       template<typename Stream, typename T, typename... A>
+       inline void pack( Stream& s, const bip::vector<T,A...>& value ) {
+         pack( s, unsigned_int((uint32_t)value.size()) );
+         auto itr = value.begin();
+         auto end = value.end();
+         while( itr != end ) {
+           fc::raw::pack( s, *itr );
+           ++itr;
+         }
+       }
+       template<typename Stream, typename T, typename... A>
+       inline void unpack( Stream& s, bip::vector<T,A...>& value ) {
+         unsigned_int size;
+         unpack( s, size );
+         value.clear(); value.resize(size);
+         for( auto& item : value )
+             fc::raw::unpack( s, item );
+       }
+   }
 }

From b28e998a84721f1334b58105516de0bb16c71eeb Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Thu, 29 Sep 2016 14:11:30 -0400
Subject: [PATCH 046/108] Allow CPP_STANDARD to be overridden

---
 CMakeLists.txt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8da424..2cf93d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -274,6 +274,10 @@ if(WIN32)
 endif(WIN32)
 # end readline stuff
 
+if( NOT CPP_STANDARD )
+  set( CPP_STANDARD, "-std=c++11" )
+endif()
+
 IF(WIN32)
   target_compile_definitions(fc PUBLIC WIN32 NOMINMAX _WIN32_WINNT=0x0501 _CRT_SECURE_NO_WARNINGS
     _SCL_SERCURE_NO_WARNINGS
@@ -295,12 +299,12 @@ ELSE()
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall")
 
   IF(APPLE)
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -Wall")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -stdlib=libc++ -Wall")
   ELSE()
     if( NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
-      target_compile_options(fc PUBLIC -std=c++11 -Wall -fnon-call-exceptions)
+      target_compile_options(fc PUBLIC ${CPP_STANDARD} -Wall -fnon-call-exceptions)
     endif()
-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fnon-call-exceptions")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -Wall -fnon-call-exceptions")
   ENDIF()
 ENDIF()
 

From 0d7916b7c2267ab96086166e1e31d77d6877c9a7 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Thu, 29 Sep 2016 14:55:09 -0400
Subject: [PATCH 047/108] Handle zlib / bzip2 not found

---
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2cf93d5..269486b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -323,6 +323,7 @@ if( ZLIB_FOUND )
   add_definitions( -DHAS_ZLIB )
 else()
   MESSAGE( STATUS "zlib not found" )
+  set( ZLIB_LIBRARIES "" )
 endif( ZLIB_FOUND )
 
 find_package( BZip2 )
@@ -331,6 +332,7 @@ if( BZIP2_FOUND )
    add_definitions( -DHAS_BZIP2 )
 else()
    MESSAGE( STATUS "bzip2 not found" )
+   set( BZIP2_LIBRARIES "" )
 endif( BZIP2_FOUND )
 
 # This will become unnecessary once we update to websocketpp which fixes upstream issue #395

From e8b7e9d44781d16ca68e88d5230d773820d808b2 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@bitshares.org>
Date: Thu, 29 Sep 2016 16:09:06 -0400
Subject: [PATCH 048/108] adding scoped_exit helper

---
 include/fc/scoped_exit.hpp | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 include/fc/scoped_exit.hpp

diff --git a/include/fc/scoped_exit.hpp b/include/fc/scoped_exit.hpp
new file mode 100644
index 0000000..98ec16d
--- /dev/null
+++ b/include/fc/scoped_exit.hpp
@@ -0,0 +1,32 @@
+#pragma once
+
+namespace fc {
+
+   template<typename Callback>
+   class scoped_exit {
+      public:
+         template<typename C>
+         scoped_exit( C&& c ):callback( std::forward<C>(c) ){}
+         scoped_exit( scoped_exit&& mv ):callback( std::move( mv.callback ) ){}
+
+         ~scoped_exit() {
+            try { callback(); } catch( ... ) {}
+         }
+
+         scoped_exit& operator = ( scoped_exit&& mv ) {
+            callback = std::move(mv);
+            return *this;
+         }
+      private:
+         scoped_exit( const scoped_exit& );
+         scoped_exit& operator=( const scoped_exit& );
+
+         Callback callback;
+   };
+
+   template<typename Callback>
+   scoped_exit<Callback> make_scoped_exit( Callback&& c ) {
+      return scoped_exit<Callback>( std::forward<Callback>(c) );
+   }
+
+}

From d352463e8209d04615dff8cf8c03d6da655f8f83 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@steemit.com>
Date: Mon, 3 Oct 2016 12:03:34 -0400
Subject: [PATCH 049/108] fix warnings generated by latest clang

---
 include/fc/exception/exception.hpp | 2 +-
 src/thread/thread_specific.cpp     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/fc/exception/exception.hpp b/include/fc/exception/exception.hpp
index 028b172..0b10632 100644
--- a/include/fc/exception/exception.hpp
+++ b/include/fc/exception/exception.hpp
@@ -76,7 +76,7 @@ namespace fc
                     const std::string& what_value = "unspecified");
          exception( const exception& e );
          exception( exception&& e );
-         ~exception();
+         virtual ~exception();
 
          const char*          name()const throw();
          int64_t              code()const throw();
diff --git a/src/thread/thread_specific.cpp b/src/thread/thread_specific.cpp
index a91236d..f04d6da 100644
--- a/src/thread/thread_specific.cpp
+++ b/src/thread/thread_specific.cpp
@@ -22,7 +22,7 @@ namespace fc
     {
       if (slot + 1 > specific_data->size())
         specific_data->resize(slot + 1);
-      (*specific_data)[slot] = std::move(detail::specific_data_info(new_value, cleanup));
+      (*specific_data)[slot] = detail::specific_data_info(new_value, cleanup);
     }
 
     void* get_thread_specific_data(unsigned slot)
@@ -62,4 +62,4 @@ namespace fc
       }
     }
   }
-} // end namespace fc
\ No newline at end of file
+} // end namespace fc

From 585cea94725f8303d927b59f46cb27058e433207 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Fri, 30 Sep 2016 15:44:34 -0400
Subject: [PATCH 050/108] sha256:  Add inverse log and testing

---
 include/fc/crypto/sha256.hpp |  2 ++
 src/crypto/sha256.cpp        | 27 +++++++++++++++++
 tests/crypto/log_test.cpp    | 58 ++++++++++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)

diff --git a/include/fc/crypto/sha256.hpp b/include/fc/crypto/sha256.hpp
index 2af8a00..a390c4f 100644
--- a/include/fc/crypto/sha256.hpp
+++ b/include/fc/crypto/sha256.hpp
@@ -92,6 +92,8 @@ class sha256
      */
     uint32_t approx_log_32()const;
 
+    void set_to_inverse_approx_log_32( uint32_t x );
+
     uint64_t _hash[4];
 };
 
diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp
index 86bd014..73b66fd 100644
--- a/src/crypto/sha256.cpp
+++ b/src/crypto/sha256.cpp
@@ -123,6 +123,33 @@ namespace fc {
       return y;
    }
 
+   void sha256::set_to_inverse_approx_log_32( uint32_t x )
+   {
+      uint8_t nzbits = uint8_t( x >> 0x18 );
+      _hash[0] = 0;
+      _hash[1] = 0;
+      _hash[2] = 0;
+      _hash[3] = 0;
+      if( nzbits == 0 )
+         return;
+      uint8_t x0 = uint8_t((x        ) & 0xFF);
+      uint8_t x1 = uint8_t((x >> 0x08) & 0xFF);
+      uint8_t x2 = uint8_t((x >> 0x10) & 0xFF);
+      uint8_t* my_bytes = (uint8_t*) data();
+      my_bytes[0x1F] = x0;
+      my_bytes[0x1E] = x1;
+      my_bytes[0x1D] = x2;
+      my_bytes[0x1C] = 1;
+
+      if( nzbits <= 0x18 )
+      {
+         (*this) = (*this) >> (0x18 - nzbits);
+      }
+      else
+         (*this) = (*this) << (nzbits - 0x18);
+      return;
+   }
+
    uint16_t sha256::clz()const
    {
       const uint8_t* my_bytes = (uint8_t*) data();
diff --git a/tests/crypto/log_test.cpp b/tests/crypto/log_test.cpp
index ca9621b..fcd67de 100644
--- a/tests/crypto/log_test.cpp
+++ b/tests/crypto/log_test.cpp
@@ -3,8 +3,30 @@
 #include <fc/exception/exception.hpp>
 
 #include <fstream>
+#include <iomanip>
 #include <iostream>
 
+uint64_t endian_reverse( uint64_t x )
+{
+   uint64_t x0 = ((x        ) & 0xFF);
+   uint64_t x1 = ((x >> 0x08) & 0xFF);
+   uint64_t x2 = ((x >> 0x10) & 0xFF);
+   uint64_t x3 = ((x >> 0x18) & 0xFF);
+   uint64_t x4 = ((x >> 0x20) & 0xFF);
+   uint64_t x5 = ((x >> 0x28) & 0xFF);
+   uint64_t x6 = ((x >> 0x30) & 0xFF);
+   uint64_t x7 = ((x >> 0x38) & 0xFF);
+
+   return (x0 << 0x38)
+        | (x1 << 0x30)
+        | (x2 << 0x28)
+        | (x3 << 0x20)
+        | (x4 << 0x18)
+        | (x5 << 0x10)
+        | (x6 << 0x08)
+        | (x7        );
+}
+
 int main(int argc, char**argv, char** envp)
 {
    std::ifstream infile("log_test.txt");
@@ -33,6 +55,42 @@ int main(int argc, char**argv, char** envp)
          std::cerr << "got error on log(" << str_h << ")" << std::endl;
          ++errors;
       }
+      h.set_to_inverse_approx_log_32( ref_log );
+      if( ref_log != h.approx_log_32() )
+      {
+         std::cerr << "got error on ilog(" << ref_log << ")" << std::endl;
+         ++errors;
+      }
+      if( h != fc::sha256() )
+      {
+         fc::sha256 h_before = h;
+         if( h._hash[3] == 0 )
+         {
+            if( h._hash[2] == 0 )
+            {
+               if( h._hash[1] == 0 )
+               {
+                  h._hash[0] = endian_reverse( endian_reverse( h._hash[0] )-1 );
+               }
+               h._hash[1] = endian_reverse( endian_reverse( h._hash[1] )-1 );
+            }
+            h._hash[2] = endian_reverse( endian_reverse( h._hash[2] )-1 );
+         }
+         h._hash[3] = endian_reverse( endian_reverse( h._hash[3] )-1 );
+         bool ok = (h.approx_log_32() < ref_log);
+         if( !ok )
+         {
+            std::cerr << "got error on logm1 for " << ref_log << std::endl;
+            std::cerr << "h0:" << str_h << std::endl;
+            std::cerr << "h1:" << h_before.str() << std::endl;
+            std::cerr << "h2:" << h.str() << std::endl;
+            std::cerr << "ref_log:" << std::hex << std::setw(8) << ref_log << std::endl;
+            std::cerr << "log(h) :" << std::hex << std::setw(8) << h.approx_log_32() << std::endl;
+            std::cerr << std::endl;
+            ++errors;
+         }
+      }
+
       ++cases;
    }
 

From 636d4530e3ac9e37040d43f1a1ff56caffb38166 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Mon, 3 Oct 2016 14:38:07 -0400
Subject: [PATCH 051/108] sha256:  Add method to return approx log as double

---
 include/fc/crypto/sha256.hpp |  1 +
 src/crypto/sha256.cpp        | 11 +++++++++++
 tests/crypto/log_test.cpp    | 13 +++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/include/fc/crypto/sha256.hpp b/include/fc/crypto/sha256.hpp
index a390c4f..a7e8deb 100644
--- a/include/fc/crypto/sha256.hpp
+++ b/include/fc/crypto/sha256.hpp
@@ -93,6 +93,7 @@ class sha256
     uint32_t approx_log_32()const;
 
     void set_to_inverse_approx_log_32( uint32_t x );
+    static double inverse_approx_log_32_double( uint32_t x );
 
     uint64_t _hash[4];
 };
diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp
index 73b66fd..c1b8235 100644
--- a/src/crypto/sha256.cpp
+++ b/src/crypto/sha256.cpp
@@ -3,6 +3,7 @@
 #include <fc/fwd_impl.hpp>
 #include <openssl/sha.h>
 #include <string.h>
+#include <cmath>
 #include <fc/crypto/sha256.hpp>
 #include <fc/variant.hpp>
 #include <fc/exception/exception.hpp>
@@ -150,6 +151,16 @@ namespace fc {
       return;
    }
 
+   double sha256::inverse_approx_log_32_double( uint32_t x )
+   {
+      uint8_t nzbits = uint8_t( x >> 0x18 );
+      if( nzbits == 0 )
+         return 0.0;
+      uint32_t b = 1 << 0x18;
+      uint32_t y = (x & (b-1)) | b;
+      return std::ldexp( y, int( nzbits ) - 0x18 );
+   }
+
    uint16_t sha256::clz()const
    {
       const uint8_t* my_bytes = (uint8_t*) data();
diff --git a/tests/crypto/log_test.cpp b/tests/crypto/log_test.cpp
index fcd67de..654c95c 100644
--- a/tests/crypto/log_test.cpp
+++ b/tests/crypto/log_test.cpp
@@ -1,4 +1,6 @@
 
+#include <boost/multiprecision/cpp_int.hpp>
+
 #include <fc/crypto/sha256.hpp>
 #include <fc/exception/exception.hpp>
 
@@ -55,12 +57,23 @@ int main(int argc, char**argv, char** envp)
          std::cerr << "got error on log(" << str_h << ")" << std::endl;
          ++errors;
       }
+      double d_ilog_h_test = h.inverse_approx_log_32_double( ref_log );
       h.set_to_inverse_approx_log_32( ref_log );
       if( ref_log != h.approx_log_32() )
       {
          std::cerr << "got error on ilog(" << ref_log << ")" << std::endl;
          ++errors;
       }
+
+      std::string str_ilog_h = h.str();
+      boost::multiprecision::uint256_t u256_ilog_h( "0x" + str_ilog_h );
+      double d_ilog_h_ref = u256_ilog_h.template convert_to<double>();
+      if( d_ilog_h_ref != d_ilog_h_test )
+      {
+         std::cerr << "got error on d_ilog(" << ref_log << ")" << std::endl;
+         ++errors;
+      }
+
       if( h != fc::sha256() )
       {
          fc::sha256 h_before = h;

From 0ace4298c58c091469ebf9aca5e45a5b104089f8 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@steemit.com>
Date: Mon, 10 Oct 2016 17:16:57 -0400
Subject: [PATCH 052/108] adding interprocess lock

---
 CMakeLists.txt                         |   4 +
 include/fc/interprocess/file_mutex.hpp |  42 +++++++++++
 src/interprocess/file_mutex.cpp        | 100 +++++++++++++++++++++++++
 tests/bip_lock.cpp                     |  44 +++++++++++
 4 files changed, 190 insertions(+)
 create mode 100644 include/fc/interprocess/file_mutex.hpp
 create mode 100644 src/interprocess/file_mutex.cpp
 create mode 100644 tests/bip_lock.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 269486b..0e24f7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,6 +187,7 @@ set( fc_sources
      src/interprocess/signals.cpp
      src/interprocess/file_mapping.cpp
      src/interprocess/mmap_struct.cpp
+     src/interprocess/file_mutex.cpp
      src/rpc/cli.cpp
      src/rpc/http_api.cpp
      src/rpc/json_connection.cpp
@@ -374,6 +375,9 @@ add_definitions(-DBOOST_TEST_DYN_LINK)
 ENDIF(MSVC)
 ENDIF()
 
+add_executable( bip_lock tests/bip_lock.cpp )
+target_link_libraries( bip_lock fc )
+
 add_executable( api tests/api.cpp )
 target_link_libraries( api fc )
 
diff --git a/include/fc/interprocess/file_mutex.hpp b/include/fc/interprocess/file_mutex.hpp
new file mode 100644
index 0000000..0379074
--- /dev/null
+++ b/include/fc/interprocess/file_mutex.hpp
@@ -0,0 +1,42 @@
+#pragma once
+#include <fc/time.hpp>
+#include <fc/thread/spin_yield_lock.hpp>
+
+namespace fc { 
+  class microseconds;
+  class time_point;
+  class path;
+  struct context;
+
+  namespace detail { class file_mutex_impl; }
+
+  /**
+   *  The purpose of this class is to support synchronization of 
+   *  processes, threads, and coop-threads.  
+   *
+   *  Before grabbing the lock for a thread or coop, a file_mutex will first
+   *  grab a process-level lock.  After grabbing the process level lock, it will
+   *  synchronize in the same way as a local process lock.
+   */
+  class file_mutex {
+     public:
+        file_mutex( const fc::path& filename );
+        ~file_mutex();
+
+        bool try_lock();
+        bool try_lock_for( const microseconds& rel_time );
+        bool try_lock_until( const time_point& abs_time );
+        void lock();
+        void unlock();
+
+        void lock_shared();
+        void unlock_shared();
+        bool try_lock_shared();
+
+        int  readers()const;
+
+     private:
+        std::unique_ptr<detail::file_mutex_impl> my;
+  };
+
+} // namespace fc
diff --git a/src/interprocess/file_mutex.cpp b/src/interprocess/file_mutex.cpp
new file mode 100644
index 0000000..72b142d
--- /dev/null
+++ b/src/interprocess/file_mutex.cpp
@@ -0,0 +1,100 @@
+#include <fc/interprocess/file_mutex.hpp>
+//#include <fc/thread/mutex.hpp>
+#include <fc/thread/mutex.hpp>
+#include <fc/filesystem.hpp>
+#include <boost/interprocess/sync/file_lock.hpp>
+#include <boost/interprocess/sync/scoped_lock.hpp>
+#include <boost/atomic.hpp>
+
+#include <fc/thread/thread.hpp>
+#include <fc/log/logger.hpp>
+
+namespace fc {
+  namespace bip = boost::interprocess;
+
+  void yield();
+
+  namespace detail { 
+     class file_mutex_impl  {
+        public:
+          file_mutex_impl( const char* f )
+          :_file_mutex( f ),_reader_count(0){}
+
+          fc::mutex  _write_lock;
+          bip::file_lock       _file_mutex;
+          boost::atomic<int>   _reader_count;
+     };
+  }
+
+  file_mutex::file_mutex( const fc::path& file )
+  {
+     my.reset( new detail::file_mutex_impl( file.generic_string().c_str() ) );
+  }
+
+  file_mutex::~file_mutex() {
+  }
+
+  int  file_mutex::readers()const {
+    return my->_reader_count.load();
+  }
+
+  bool file_mutex::try_lock() {
+     return false;
+     if( my->_write_lock.try_lock() ) {
+        if( my->_file_mutex.try_lock() )
+           return true;
+     }
+     if( my->_file_mutex.try_lock() ) {
+        if( my->_write_lock.try_lock() ) {
+          return true;
+        } else {
+          my->_file_mutex.unlock();
+        }
+     }
+     return false;
+  }
+
+  bool file_mutex::try_lock_for( const microseconds& rel_time ) {
+     return false;
+  }
+
+  bool file_mutex::try_lock_until( const time_point& abs_time ) {
+     return false;
+  }
+
+  void file_mutex::lock() {
+     my->_write_lock.lock();
+     while( my->_reader_count.load() > 0 ) {
+        fc::usleep( fc::microseconds(10) );
+     }
+     my->_file_mutex.lock();
+  }
+
+  void file_mutex::unlock() {
+     my->_file_mutex.unlock();
+     my->_write_lock.unlock();
+  }
+
+  void file_mutex::lock_shared() {
+    bip::scoped_lock< fc::mutex > lock( my->_write_lock );
+    if( 0 == my->_reader_count.fetch_add( 1, boost::memory_order_relaxed ) )
+       my->_file_mutex.lock_sharable();
+  }
+
+  void file_mutex::unlock_shared() {
+    if( 1 == my->_reader_count.fetch_add( -1, boost::memory_order_relaxed ) )
+       my->_file_mutex.unlock_sharable();
+  }
+
+  bool file_mutex::try_lock_shared() {
+    return false;
+    if( my->_write_lock.try_lock() ) {
+       if( my->_reader_count.load() == 0 && my->_file_mutex.try_lock_sharable() ) {
+          my->_reader_count++;
+       }
+       my->_write_lock.unlock();
+    }
+    return false;
+  }
+
+} // namespace fc 
diff --git a/tests/bip_lock.cpp b/tests/bip_lock.cpp
new file mode 100644
index 0000000..38bf684
--- /dev/null
+++ b/tests/bip_lock.cpp
@@ -0,0 +1,44 @@
+#include <iostream>
+#include <fc/interprocess/file_mutex.hpp>
+#include <fc/filesystem.hpp>
+#include <fc/log/logger.hpp>
+#include <fc/thread/thread.hpp>
+
+int main( int argc, char** argv ) {
+   if( argc < 2 ) return 0;
+   fc::file_mutex m( argv[1] );
+   auto mptr = &m;
+
+   fc::thread in("in");
+
+  std::string cmd;
+  std::cout << ">>> ";
+  std::cin >> cmd;
+  int i = 0;
+  while( !std::cin.eof() && cmd != "q" ) {
+    ++i;
+    fc::async( [i, cmd,mptr]() {
+       ilog( "start ${c} ${i}", ("c",cmd)("i",i) );
+       if( cmd == "L" ) {
+          mptr->lock();
+       } else if( cmd == "l" ) {
+          mptr->lock_shared();
+       } else if( cmd == "U" ) {
+          mptr->unlock();
+       } else if( cmd == "u" ) {
+          mptr->unlock_shared();
+       }
+       ilog( "end ${c} ${i}", ("c",cmd)("i",i) );
+    } );
+    fc::usleep( fc::microseconds( 1000 ) );
+    cmd = in.async( [&]() {
+       std::string tmp;
+       wdump((m.readers()));
+       std::cin >> tmp;
+       return tmp;
+    } );
+  }
+  std::cout << "done";
+
+  return 0;
+}

From 815f07506cb0e0ad81fbff7bc0fedd229192a53f Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@steemit.com>
Date: Tue, 18 Oct 2016 11:53:26 -0400
Subject: [PATCH 053/108] small formatting issues and helper api

---
 include/fc/array.hpp        |  4 +++-
 include/fc/filesystem.hpp   | 10 +++++-----
 include/fc/thread/mutex.hpp |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/fc/array.hpp b/include/fc/array.hpp
index 226d199..8453447 100644
--- a/include/fc/array.hpp
+++ b/include/fc/array.hpp
@@ -25,10 +25,12 @@ namespace fc {
     const T& operator[]( size_t pos )const { assert( pos < N); return data[pos]; }
 
     
-    T*           begin()       {  return &data[0]; }
     const T*     begin()const  {  return &data[0]; }
     const T*     end()const    {  return &data[N]; }
 
+    T*           begin()       {  return &data[0]; }
+    T*           end()         {  return &data[N]; }
+
     size_t       size()const { return N; }
     
     T data[N];
diff --git a/include/fc/filesystem.hpp b/include/fc/filesystem.hpp
index 1a16926..7484f2a 100644
--- a/include/fc/filesystem.hpp
+++ b/include/fc/filesystem.hpp
@@ -31,7 +31,7 @@ namespace fc {
       path();
       ~path();
       path( const boost::filesystem::path& );
-      path( const fc::string& p );
+      path( const std::string& p );
       /// Constructor to build path using unicode native characters.
       path(const std::wstring& p);
       path( const char* );
@@ -54,12 +54,12 @@ namespace fc {
       fc::path     extension()const;
       fc::path     filename()const;
       fc::path     parent_path()const;
-      fc::string   string()const;
-      fc::string   generic_string()const;
+      std::string   string()const;
+      std::string   generic_string()const;
       /** On windows, returns a path where all path separators are '\' suitable for displaying
        * to users.  On other platforms, it does the same as generic_string()
        */
-      fc::string   preferred_string() const;
+      std::string   preferred_string() const;
 
       std::wstring wstring() const;
       std::wstring generic_wstring() const;
@@ -77,7 +77,7 @@ namespace fc {
        *
        * @note not part of boost::filesystem::path
        */
-      fc::string windows_string()const;
+      std::string windows_string()const;
 
       bool       is_relative()const;
       bool       is_absolute()const;
diff --git a/include/fc/thread/mutex.hpp b/include/fc/thread/mutex.hpp
index 544253e..59f8941 100644
--- a/include/fc/thread/mutex.hpp
+++ b/include/fc/thread/mutex.hpp
@@ -61,7 +61,7 @@ namespace fc {
    *
    *  @code
    *    void write_message() {
-   *      boost::unique_lock<cmt::mutex> lock(sock->write_lock);
+   *      boost::unique_lock<fc::mutex> lock(sock->write_lock);
    *      sock->write(part1); // may yield
    *      sock->write(part2); // may yield
    *      sock->write(part3); // may yield

From 962a816d1763a7a824b540e013f4ce4f1942ba90 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Tue, 18 Oct 2016 15:57:46 -0400
Subject: [PATCH 054/108] variant.cpp:  Fix bug in FC_ASSERT()

---
 src/variant.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/variant.cpp b/src/variant.cpp
index 542ee66..3af5683 100644
--- a/src/variant.cpp
+++ b/src/variant.cpp
@@ -663,7 +663,7 @@ void from_variant( const variant& var,  std::vector<char>& vo )
      if( vo.size() )
      {
         size_t r = from_hex( str, vo.data(), vo.size() );
-        FC_ASSERT( r = vo.size() );
+        FC_ASSERT( r == vo.size() );
      }
 //   std::string b64 = base64_decode( var.as_string() );
 //   vo = std::vector<char>( b64.c_str(), b64.c_str() + b64.size() );

From 929d42fe02badf5933b02f94cc283bbdccc8a869 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Tue, 18 Oct 2016 15:58:16 -0400
Subject: [PATCH 055/108] Add from/to variant for bip::vector<char, A...>

---
 include/fc/interprocess/container.hpp | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/include/fc/interprocess/container.hpp b/include/fc/interprocess/container.hpp
index 32f6a95..1b74011 100644
--- a/include/fc/interprocess/container.hpp
+++ b/include/fc/interprocess/container.hpp
@@ -7,9 +7,9 @@
 #include <boost/interprocess/containers/map.hpp>
 #include <boost/interprocess/containers/flat_map.hpp>
 #include <boost/interprocess/containers/deque.hpp>
+#include <fc/crypto/hex.hpp>
 #include <fc/io/raw_fwd.hpp>
 
-
 namespace fc {
 
    namespace bip = boost::interprocess;
@@ -72,6 +72,29 @@ namespace fc {
       }
     }
 
+    template<typename... A>
+    void to_variant( const bip::vector<char, A...>& t, fc::variant& v )
+    {
+        if( t.size() )
+            v = variant(fc::to_hex(t.data(), t.size()));
+        else
+            v = "";
+    }
+
+    template<typename... A>
+    void from_variant( const fc::variant& v, bip::vector<char, A...>& d )
+    {
+         auto str = v.as_string();
+         d.resize( str.size() / 2 );
+         if( d.size() )
+         {
+            size_t r = fc::from_hex( str, d.data(), d.size() );
+            FC_ASSERT( r == d.size() );
+         }
+    //   std::string b64 = base64_decode( var.as_string() );
+    //   vo = std::vector<char>( b64.c_str(), b64.c_str() + b64.size() );
+    }
+
    namespace raw {
        namespace bip = boost::interprocess;
 

From 9ce9270f82d99f78368cb81401a26c2272cfc548 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Thu, 20 Oct 2016 14:32:11 -0400
Subject: [PATCH 056/108] Add to_variant for some bip types

---
 include/fc/interprocess/container.hpp | 35 ++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/include/fc/interprocess/container.hpp b/include/fc/interprocess/container.hpp
index 1b74011..ed761b8 100644
--- a/include/fc/interprocess/container.hpp
+++ b/include/fc/interprocess/container.hpp
@@ -6,6 +6,7 @@
 #include <boost/interprocess/containers/vector.hpp>
 #include <boost/interprocess/containers/map.hpp>
 #include <boost/interprocess/containers/flat_map.hpp>
+#include <boost/interprocess/containers/set.hpp>
 #include <boost/interprocess/containers/deque.hpp>
 #include <fc/crypto/hex.hpp>
 #include <fc/io/raw_fwd.hpp>
@@ -33,25 +34,25 @@ namespace fc {
       }
     }
 
-    /*  bip::flat_map == boost::flat_map
+    //bip::map == boost::map
     template<typename K, typename V, typename... T >
-    void to_variant( const bip::flat_map< K, V, T... >& var, fc::variant& vo ) {
+    void to_variant( const bip::map< K, V, T... >& var, fc::variant& vo ) {
        std::vector< variant > vars(var.size());
        size_t i = 0;
        for( auto itr = var.begin(); itr != var.end(); ++itr, ++i )
           vars[i] = fc::variant(*itr);
        vo = vars;
     }
-
+/*
     template<typename K, typename V, typename... A>
-    void from_variant( const variant& var,  bip::flat_map<K, V, A...>& vo )
+    void from_variant( const variant& var,  bip::map<K, V, A...>& vo )
     {
        const variants& vars = var.get_array();
        vo.clear();
        for( auto itr = vars.begin(); itr != vars.end(); ++itr )
-          vo.insert( itr->as< std::pair<K,V> >() );
+          vo.insert( itr->as< std::pair<K,V> >() ); Not safe for interprocess. Needs allocator
     }
-    */
+*/
 
     template<typename... T >
     void to_variant( const bip::vector< T... >& t, fc::variant& v ) {
@@ -72,6 +73,28 @@ namespace fc {
       }
     }
 
+    template<typename... T >
+    void to_variant( const bip::set< T... >& t, fc::variant& v ) {
+      std::vector<variant> vars;
+      vars.reserve(t.size());
+      for( const auto& item : t ) {
+         vars.emplace_back( item );
+      }
+      v = std::move(vars);
+    }
+
+/*
+    template<typename T, typename... A>
+    void from_variant( const fc::variant& v, bip::set< T, A... >& d ) {
+      const variants& vars = v.get_array();
+      d.clear();
+      d.reserve( vars.size() );
+      for( uint32_t i = 0; i < vars.size(); ++i ) {
+         from_variant( vars[i], d[i] ); Not safe for interprocess. Needs allocator
+      }
+    }
+*/
+
     template<typename... A>
     void to_variant( const bip::vector<char, A...>& t, fc::variant& v )
     {

From 013fbfb6a74fb8cd8afd6f4e343ea6e8f9213e01 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Fri, 21 Oct 2016 14:06:22 -0400
Subject: [PATCH 057/108] Remove logging on successful thread creation

---
 src/thread/thread.cpp | 158 +++++++++++++++++++++---------------------
 1 file changed, 79 insertions(+), 79 deletions(-)

diff --git a/src/thread/thread.cpp b/src/thread/thread.cpp
index 7730a3a..7b899bb 100644
--- a/src/thread/thread.cpp
+++ b/src/thread/thread.cpp
@@ -92,7 +92,7 @@ namespace fc {
       p->wait();
       my->boost_thread = t;
       my->name = name;
-      wlog("name:${n} tid:${tid}", ("n", name)("tid", (uintptr_t)my->boost_thread->native_handle()) );
+      //wlog("name:${n} tid:${tid}", ("n", name)("tid", (uintptr_t)my->boost_thread->native_handle()) );
    }
    thread::thread( thread_d* ) {
      my = new thread_d(*this);
@@ -118,24 +118,24 @@ namespace fc {
    }
 
    thread& thread::current() {
-     if( !current_thread() ) 
+     if( !current_thread() )
        current_thread() = new thread((thread_d*)0);
      return *current_thread();
    }
 
-   const string& thread::name()const 
-   { 
-     return my->name; 
+   const string& thread::name()const
+   {
+     return my->name;
    }
 
    void thread::set_name( const fc::string& n )
-   { 
+   {
      if (!is_current())
      {
        async([=](){ set_name(n); }, "set_name").wait();
        return;
      }
-     my->name = n; 
+     my->name = n;
      set_thread_name(my->name.c_str()); // set thread's name for the debugger to display
    }
 
@@ -145,17 +145,17 @@ namespace fc {
          return my->current->cur_task->get_desc();
       return NULL;
    }
-   
+
    void          thread::debug( const fc::string& d ) { /*my->debug(d);*/ }
 
-  void thread::quit() 
+  void thread::quit()
   {
     //if quitting from a different thread, start quit task on thread.
     //If we have and know our attached boost thread, wait for it to finish, then return.
-    if( &current() != this ) 
+    if( &current() != this )
     {
       async( [=](){quit();}, "thread::quit" );//.wait();
-      if( my->boost_thread ) 
+      if( my->boost_thread )
       {
         //wlog("destroying boost thread ${tid}",("tid",(uintptr_t)my->boost_thread->native_handle()));
         my->boost_thread->join();
@@ -170,23 +170,23 @@ namespace fc {
     // We are quiting from our own thread...
 
     // break all promises, thread quit!
-    while( my->blocked ) 
+    while( my->blocked )
     {
       fc::context* cur  = my->blocked;
-      while( cur ) 
+      while( cur )
       {
         fc::context* n = cur->next;
         // this will move the context into the ready list.
         //cur->prom->set_exception( boost::copy_exception( error::thread_quit() ) );
         //cur->set_exception_on_blocking_promises( thread_quit() );
         cur->set_exception_on_blocking_promises( std::make_shared<canceled_exception>(FC_LOG_MESSAGE(error, "cancellation reason: thread quitting")) );
-               
+
         cur = n;
       }
-      if( my->blocked ) 
-      { 
+      if( my->blocked )
+      {
         //wlog( "still blocking... whats up with that?");
-        debug( "on quit" ); 
+        debug( "on quit" );
       }
     }
     BOOST_ASSERT( my->blocked == 0 );
@@ -200,7 +200,7 @@ namespace fc {
       scheduled_task->set_exception(std::make_shared<canceled_exception>(FC_LOG_MESSAGE(error, "cancellation reason: thread quitting")));
     my->task_sch_queue.clear();
 
-    
+
 
     // move all sleep tasks to ready
     for( uint32_t i = 0; i < my->sleep_pqueue.size(); ++i )
@@ -209,7 +209,7 @@ namespace fc {
 
     // move all idle tasks to ready
     fc::context* cur = my->pt_head;
-    while( cur ) 
+    while( cur )
     {
       fc::context* n = cur->next;
       cur->next = 0;
@@ -217,7 +217,7 @@ namespace fc {
       cur = n;
     }
 
-    // mark all ready tasks (should be everyone)... as canceled 
+    // mark all ready tasks (should be everyone)... as canceled
     for (fc::context* ready_context : my->ready_heap)
       ready_context->canceled = true;
 
@@ -225,22 +225,22 @@ namespace fc {
     // let them all quit.
     while (!my->ready_heap.empty())
     {
-      my->start_next_fiber(true); 
+      my->start_next_fiber(true);
       my->check_for_timeouts();
     }
     my->clear_free_list();
     my->cleanup_thread_specific_data();
   }
-     
-   void thread::exec() 
+
+   void thread::exec()
    {
-      if( !my->current ) 
+      if( !my->current )
         my->current = new fc::context(&fc::thread::current());
-      
-      try 
+
+      try
       {
-        my->process_tasks(); 
-      } 
+        my->process_tasks();
+      }
       catch( canceled_exception& e )
       {
         dlog( "thread canceled: ${e}", ("e", e.to_detail_string()) );
@@ -248,40 +248,40 @@ namespace fc {
       delete my->current;
       my->current = 0;
    }
-     
-   bool thread::is_running()const 
+
+   bool thread::is_running()const
    {
       return !my->done;
    }
-     
-   priority thread::current_priority()const 
+
+   priority thread::current_priority()const
    {
       BOOST_ASSERT(my);
-      if( my->current ) 
+      if( my->current )
         return my->current->prio;
       return priority();
    }
 
-   void thread::yield(bool reschedule) 
+   void thread::yield(bool reschedule)
    {
       my->check_fiber_exceptions();
       my->start_next_fiber(reschedule);
       my->check_fiber_exceptions();
    }
 
-   void thread::sleep_until( const time_point& tp ) 
+   void thread::sleep_until( const time_point& tp )
    {
-     if( tp <= (time_point::now()+fc::microseconds(10000)) ) 
+     if( tp <= (time_point::now()+fc::microseconds(10000)) )
        yield(true);
      my->yield_until( tp, false );
    }
 
    int  thread::wait_any_until( std::vector<promise_base::ptr>&& p, const time_point& timeout) {
        for( size_t i = 0; i < p.size(); ++i )
-         if( p[i]->ready() ) 
+         if( p[i]->ready() )
            return i;
 
-       if( timeout < time_point::now() ) 
+       if( timeout < time_point::now() )
        {
          fc::stringstream ss;
          for( auto i = p.begin(); i != p.end(); ++i )
@@ -289,20 +289,20 @@ namespace fc {
 
          FC_THROW_EXCEPTION( timeout_exception, "${task}", ("task",ss.str()) );
        }
-       
+
        if( !my->current )
-         my->current = new fc::context(&fc::thread::current()); 
-     
+         my->current = new fc::context(&fc::thread::current());
+
        for( uint32_t i = 0; i < p.size(); ++i )
          my->current->add_blocking_promise(p[i].get(),false);
 
        // if not max timeout, added to sleep pqueue
-       if( timeout != time_point::maximum() ) 
+       if( timeout != time_point::maximum() )
        {
            my->current->resume_time = timeout;
            my->sleep_pqueue.push_back(my->current);
            std::push_heap( my->sleep_pqueue.begin(),
-                           my->sleep_pqueue.end(), 
+                           my->sleep_pqueue.end(),
                            sleep_priority_less()   );
        }
 
@@ -311,11 +311,11 @@ namespace fc {
 
        for( auto i = p.begin(); i != p.end(); ++i )
          my->current->remove_blocking_promise(i->get());
-     
+
        my->check_fiber_exceptions();
 
        for( uint32_t i = 0; i < p.size(); ++i )
-         if( p[i]->ready() ) 
+         if( p[i]->ready() )
            return i;
 
        //BOOST_THROW_EXCEPTION( wait_any_error() );
@@ -342,8 +342,8 @@ namespace fc {
 
       // Because only one thread can post the 'first task', only that thread will attempt
       // to aquire the lock and therefore there should be no contention on this lock except
-      // when *this thread is about to block on a wait condition.  
-      if( this != &current() &&  !stale_head ) { 
+      // when *this thread is about to block on a wait condition.
+      if( this != &current() &&  !stale_head ) {
           boost::unique_lock<boost::mutex> lock(my->task_ready_mutex);
           my->task_ready.notify_one();
       }
@@ -359,42 +359,42 @@ namespace fc {
       thread::current().sleep_until(tp);
    }
 
-   void  exec() 
+   void  exec()
    {
       return thread::current().exec();
    }
 
-   int wait_any( std::vector<promise_base::ptr>&& v, const microseconds& timeout_us  ) 
+   int wait_any( std::vector<promise_base::ptr>&& v, const microseconds& timeout_us  )
    {
       return thread::current().wait_any_until( fc::move(v), time_point::now() + timeout_us );
    }
 
-   int wait_any_until( std::vector<promise_base::ptr>&& v, const time_point& tp ) 
+   int wait_any_until( std::vector<promise_base::ptr>&& v, const time_point& tp )
    {
       return thread::current().wait_any_until( fc::move(v), tp );
    }
 
-   void thread::wait_until( promise_base::ptr&& p, const time_point& timeout ) 
+   void thread::wait_until( promise_base::ptr&& p, const time_point& timeout )
    {
-         if( p->ready() ) 
+         if( p->ready() )
            return;
 
-         if( timeout < time_point::now() ) 
+         if( timeout < time_point::now() )
            FC_THROW_EXCEPTION( timeout_exception, "${task}", ("task", p->get_desc()) );
-         
-         if( !my->current ) 
-           my->current = new fc::context(&fc::thread::current()); 
-         
+
+         if( !my->current )
+           my->current = new fc::context(&fc::thread::current());
+
          //slog( "                                 %1% blocking on %2%", my->current, p.get() );
          my->current->add_blocking_promise(p.get(), true);
 
          // if not max timeout, added to sleep pqueue
-         if( timeout != time_point::maximum() ) 
+         if( timeout != time_point::maximum() )
          {
              my->current->resume_time = timeout;
              my->sleep_pqueue.push_back(my->current);
              std::push_heap( my->sleep_pqueue.begin(),
-                             my->sleep_pqueue.end(), 
+                             my->sleep_pqueue.end(),
                              sleep_priority_less() );
          }
 
@@ -412,34 +412,34 @@ namespace fc {
          my->check_fiber_exceptions();
     }
 
-    void thread::notify( const promise_base::ptr& p ) 
+    void thread::notify( const promise_base::ptr& p )
     {
       //slog( "this %p  my %p", this, my );
       BOOST_ASSERT(p->ready());
-      if( !is_current() ) 
+      if( !is_current() )
       {
         this->async( [=](){ notify(p); }, "notify", priority::max() );
         return;
       }
-      // TODO: store a list of blocked contexts with the promise 
+      // TODO: store a list of blocked contexts with the promise
       //  to accelerate the lookup.... unless it introduces contention...
-      
+
       // iterate over all blocked contexts
 
 
       fc::context* cur_blocked  = my->blocked;
       fc::context* prev_blocked = 0;
-      while( cur_blocked ) 
+      while( cur_blocked )
       {
-        // if the blocked context is waiting on this promise 
-        if( cur_blocked->try_unblock( p.get() )  ) 
+        // if the blocked context is waiting on this promise
+        if( cur_blocked->try_unblock( p.get() )  )
         {
           // remove it from the blocked list.
 
           // remove this context from the sleep queue...
-          for( uint32_t i = 0; i < my->sleep_pqueue.size(); ++i ) 
+          for( uint32_t i = 0; i < my->sleep_pqueue.size(); ++i )
           {
-            if( my->sleep_pqueue[i] == cur_blocked ) 
+            if( my->sleep_pqueue[i] == cur_blocked )
             {
               my->sleep_pqueue[i]->blocking_prom.clear();
               my->sleep_pqueue[i] = my->sleep_pqueue.back();
@@ -449,28 +449,28 @@ namespace fc {
             }
           }
           auto cur = cur_blocked;
-          if( prev_blocked ) 
-          {  
-              prev_blocked->next_blocked = cur_blocked->next_blocked; 
+          if( prev_blocked )
+          {
+              prev_blocked->next_blocked = cur_blocked->next_blocked;
               cur_blocked =  prev_blocked->next_blocked;
-          } 
-          else 
-          { 
-              my->blocked = cur_blocked->next_blocked; 
+          }
+          else
+          {
+              my->blocked = cur_blocked->next_blocked;
               cur_blocked = my->blocked;
           }
           cur->next_blocked = 0;
           my->add_context_to_ready_list( cur );
-        } 
-        else 
+        }
+        else
         { // goto the next blocked task
           prev_blocked  = cur_blocked;
           cur_blocked   = cur_blocked->next_blocked;
         }
       }
     }
-    
-    bool thread::is_current()const 
+
+    bool thread::is_current()const
     {
       return this == &current();
     }

From ee6ee272902c17d9e9986b8e833736da46d48565 Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@steemit.com>
Date: Mon, 24 Oct 2016 17:44:53 -0400
Subject: [PATCH 058/108] clean up tests and add some utility methods

---
 CMakeLists.txt                  | 74 +++------------------------------
 CMakeModules/FindReadline.cmake |  2 +
 include/fc/crypto/sha256.hpp    | 12 ++++++
 include/fc/io/raw_fwd.hpp       |  3 ++
 tests/CMakeLists.txt            | 69 ++++++++++++++++++++++++++++++
 tests/crypto/blind.cpp          | 14 +++----
 6 files changed, 99 insertions(+), 75 deletions(-)
 create mode 100644 tests/CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e24f7a..8498657 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,6 +151,11 @@ ENDIF()
 
 find_package(OpenSSL REQUIRED)
 
+set(RAPIDJSON_USE_SSE2 ON)
+set(RAPIDJSON_USE_SSE42 ON)
+find_package(RapidJSON REQUIRED)
+
+
 set( CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_LIB_SUFFIXES} )
 
 option( UNITY_BUILD OFF )
@@ -375,76 +380,9 @@ add_definitions(-DBOOST_TEST_DYN_LINK)
 ENDIF(MSVC)
 ENDIF()
 
-add_executable( bip_lock tests/bip_lock.cpp )
-target_link_libraries( bip_lock fc )
-
-add_executable( api tests/api.cpp )
-target_link_libraries( api fc )
-
-if( ECC_IMPL STREQUAL secp256k1 )
-    add_executable( blind tests/all_tests.cpp tests/crypto/blind.cpp )
-    target_link_libraries( blind fc )
-endif()
-
 include_directories( vendor/websocketpp )
 
-add_executable( ntp_test tests/all_tests.cpp tests/network/ntp_test.cpp )
-target_link_libraries( ntp_test fc )
-
-add_executable( task_cancel_test tests/all_tests.cpp tests/thread/task_cancel.cpp )
-target_link_libraries( task_cancel_test fc )
-
-
-add_executable( bloom_test tests/all_tests.cpp tests/bloom_test.cpp )
-target_link_libraries( bloom_test fc )
-
-add_executable( real128_test tests/all_tests.cpp tests/real128_test.cpp )
-target_link_libraries( real128_test fc )
-
-add_executable( hmac_test tests/hmac_test.cpp )
-target_link_libraries( hmac_test fc )
-
-add_executable( blinding_test tests/blinding_test.cpp )
-target_link_libraries( blinding_test fc )
-
-
-add_executable( udt_server tests/udts.cpp )
-target_link_libraries( udt_server fc udt )
-
-add_executable( udt_client tests/udtc.cpp )
-target_link_libraries( udt_client fc udt )
-
-add_executable( ecc_test tests/crypto/ecc_test.cpp )
-target_link_libraries( ecc_test fc )
-
-add_executable( log_test tests/crypto/log_test.cpp )
-target_link_libraries( log_test fc )
-
-#add_executable( test_aes tests/aes_test.cpp )
-#target_link_libraries( test_aes fc ${rt_library} ${pthread_library} )
-#add_executable( test_sleep tests/sleep.cpp )
-#target_link_libraries( test_sleep fc )
-#add_executable( test_rate_limiting tests/rate_limiting.cpp )
-#target_link_libraries( test_rate_limiting fc )
-
-add_executable( all_tests tests/all_tests.cpp
-                          tests/compress/compress.cpp
-                          tests/crypto/aes_test.cpp
-                          tests/crypto/base_n_tests.cpp
-                          tests/crypto/bigint_test.cpp
-                          tests/crypto/blind.cpp
-                          tests/crypto/blowfish_test.cpp
-                          tests/crypto/dh_test.cpp
-                          tests/crypto/rand_test.cpp
-                          tests/crypto/sha_tests.cpp
-                          tests/network/ntp_test.cpp
-                          tests/network/http/websocket_test.cpp
-                          tests/thread/task_cancel.cpp
-                          tests/bloom_test.cpp
-                          tests/real128_test.cpp
-                          tests/utf8_test.cpp
-                          )
-target_link_libraries( all_tests fc )
+add_subdirectory(tests)
 
 if(WIN32)
    # add addtional import library on windows platform
diff --git a/CMakeModules/FindReadline.cmake b/CMakeModules/FindReadline.cmake
index 745cfe5..f1d0d74 100644
--- a/CMakeModules/FindReadline.cmake
+++ b/CMakeModules/FindReadline.cmake
@@ -45,3 +45,5 @@ mark_as_advanced(
     Readline_INCLUDE_DIR
     Readline_LIBRARY
 )
+
+MESSAGE( STATUS "Found Readline: ${Readline_LIBRARY}" )
diff --git a/include/fc/crypto/sha256.hpp b/include/fc/crypto/sha256.hpp
index a7e8deb..58bba9e 100644
--- a/include/fc/crypto/sha256.hpp
+++ b/include/fc/crypto/sha256.hpp
@@ -118,5 +118,17 @@ namespace std
        }
     };
 }
+
+namespace boost
+{
+    template<>
+    struct hash<fc::sha256>
+    {
+       size_t operator()( const fc::sha256& s )const
+       {
+           return  s._hash[3];//*((size_t*)&s);
+       }
+    };
+}
 #include <fc/reflect/reflect.hpp>
 FC_REFLECT_TYPENAME( fc::sha256 )
diff --git a/include/fc/io/raw_fwd.hpp b/include/fc/io/raw_fwd.hpp
index c98b932..f397202 100644
--- a/include/fc/io/raw_fwd.hpp
+++ b/include/fc/io/raw_fwd.hpp
@@ -28,6 +28,9 @@ namespace fc {
    template<typename Storage> class fixed_string;
 
    namespace raw {
+    template<typename T>
+    inline size_t pack_size(  const T& v );
+
     template<typename Stream, typename Storage> inline void pack( Stream& s, const fc::fixed_string<Storage>& u );
     template<typename Stream, typename Storage> inline void unpack( Stream& s, fc::fixed_string<Storage>& u );
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 0000000..50ff992
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,69 @@
+
+add_executable( bip_lock bip_lock.cpp )
+target_link_libraries( bip_lock fc )
+
+add_executable( api api.cpp )
+target_link_libraries( api fc )
+
+if( ECC_IMPL STREQUAL secp256k1 )
+    add_executable( blind all_tests.cpp crypto/blind.cpp )
+    target_link_libraries( blind fc )
+endif()
+
+add_executable( ntp_test all_tests.cpp network/ntp_test.cpp )
+target_link_libraries( ntp_test fc )
+
+add_executable( task_cancel_test all_tests.cpp thread/task_cancel.cpp )
+target_link_libraries( task_cancel_test fc )
+
+
+add_executable( bloom_test all_tests.cpp bloom_test.cpp )
+target_link_libraries( bloom_test fc )
+
+add_executable( real128_test all_tests.cpp real128_test.cpp )
+target_link_libraries( real128_test fc )
+
+add_executable( hmac_test hmac_test.cpp )
+target_link_libraries( hmac_test fc )
+
+add_executable( blinding_test blinding_test.cpp )
+target_link_libraries( blinding_test fc )
+
+
+add_executable( udt_server udts.cpp )
+target_link_libraries( udt_server fc udt )
+
+add_executable( udt_client udtc.cpp )
+target_link_libraries( udt_client fc udt )
+
+add_executable( ecc_test crypto/ecc_test.cpp )
+target_link_libraries( ecc_test fc )
+
+add_executable( log_test crypto/log_test.cpp )
+target_link_libraries( log_test fc )
+
+#add_executable( test_aes aes_test.cpp )
+#target_link_libraries( test_aes fc ${rt_library} ${pthread_library} )
+#add_executable( test_sleep sleep.cpp )
+#target_link_libraries( test_sleep fc )
+#add_executable( test_rate_limiting rate_limiting.cpp )
+#target_link_libraries( test_rate_limiting fc )
+
+add_executable( all_tests all_tests.cpp
+                          compress/compress.cpp
+                          crypto/aes_test.cpp
+                          crypto/base_n_tests.cpp
+                          crypto/bigint_test.cpp
+                          crypto/blind.cpp
+                          crypto/blowfish_test.cpp
+                          crypto/dh_test.cpp
+                          crypto/rand_test.cpp
+                          crypto/sha_tests.cpp
+                          network/ntp_test.cpp
+                          network/http/websocket_test.cpp
+                          thread/task_cancel.cpp
+                          bloom_test.cpp
+                          real128_test.cpp
+                          utf8_test.cpp
+                          )
+target_link_libraries( all_tests fc )
diff --git a/tests/crypto/blind.cpp b/tests/crypto/blind.cpp
index 29f81f9..33dfb46 100644
--- a/tests/crypto/blind.cpp
+++ b/tests/crypto/blind.cpp
@@ -50,15 +50,15 @@ BOOST_AUTO_TEST_CASE(blind_test)
       auto B4 = fc::sha256::hash("B4");
       auto C1 = fc::ecc::blind( B1, 1  );
       auto C2 = fc::ecc::blind( B2, 2  );
-      auto c3 = fc::ecc::blind( b3, 3  );
-      auto C4 = fc::ecc::blind( B4, -1 );
+      /*auto c3 = */fc::ecc::blind( b3, 3  );
+      /*auto C4 = */fc::ecc::blind( B4, -1 );
 
       auto B3 = fc::ecc::blind_sum( {B1,B2}, 2 );
       auto C3 = fc::ecc::blind( B3, 3 );
 
 
       auto B2m1 = fc::ecc::blind_sum( {B2,B1}, 1 );
-      auto C2m1 = fc::ecc::blind( B2m1, 1 );
+      /*auto C2m1 = */fc::ecc::blind( B2m1, 1 );
 
       BOOST_CHECK( fc::ecc::verify_sum( {C1,C2}, {C3}, 0 ) );
       BOOST_CHECK( fc::ecc::verify_sum( {C1,C2}, {C3}, 0 ) );
@@ -68,9 +68,9 @@ BOOST_AUTO_TEST_CASE(blind_test)
 
       {
          auto B1 = fc::sha256::hash("B1");
-         auto B2 = fc::sha256::hash("B2");
-         auto B3 = fc::sha256::hash("B3");
-         auto B4 = fc::sha256::hash("B4");
+         /*auto B2 = */fc::sha256::hash("B2");
+         /*auto B3 = */fc::sha256::hash("B3");
+         /*auto B4 = */fc::sha256::hash("B4");
 
          //secp256k1_scalar_get_b32((unsigned char*)&B1, (const secp256k1_scalar_t*)&B2);
          //B1 = fc::variant("b2e5da56ef9f2a34d3e22fd12634bc99261e95c87b9960bf94ed3d27b30").as<fc::sha256>();
@@ -78,7 +78,7 @@ BOOST_AUTO_TEST_CASE(blind_test)
          auto C1 = fc::ecc::blind( B1, INT64_MAX );
          auto C2 = fc::ecc::blind( B1, 0 );
          auto C3 = fc::ecc::blind( B1, 1 );
-         auto C4 = fc::ecc::blind( B1, 2 );
+         /*auto C4 = */fc::ecc::blind( B1, 2 );
 
          BOOST_CHECK( fc::ecc::verify_sum( {C2}, {C3}, -1 ) );
          BOOST_CHECK( fc::ecc::verify_sum( {C1}, {C1}, 0 ) );

From 3dc9639bdd091460ff3b7e25a6c8742ead4a783c Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Wed, 26 Oct 2016 13:15:11 -0400
Subject: [PATCH 059/108] api_connection.hpp:  Handle deserialization of null
 api_ptr

---
 include/fc/rpc/api_connection.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/fc/rpc/api_connection.hpp b/include/fc/rpc/api_connection.hpp
index c2268ea..1cd5561 100644
--- a/include/fc/rpc/api_connection.hpp
+++ b/include/fc/rpc/api_connection.hpp
@@ -301,6 +301,8 @@ namespace fc {
                const std::shared_ptr<fc::api_connection>&  con
             )
             {
+               if( v.is_null() )
+                  return fc::api_ptr();
                return fc::api_ptr( new detail::any_api( v.as_uint64(), con ) );
             }
 

From 0e5a4fea68c1f7fadabab89edef027d6674e8dd9 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Thu, 27 Oct 2016 12:52:44 -0400
Subject: [PATCH 060/108] Remove rapid JSON dependency

---
 CMakeLists.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8498657..b6a1ecf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,11 +151,6 @@ ENDIF()
 
 find_package(OpenSSL REQUIRED)
 
-set(RAPIDJSON_USE_SSE2 ON)
-set(RAPIDJSON_USE_SSE42 ON)
-find_package(RapidJSON REQUIRED)
-
-
 set( CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_LIB_SUFFIXES} )
 
 option( UNITY_BUILD OFF )

From 463f242ffa4132d22a5006d653bc67b5b703851f Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Mon, 7 Nov 2016 14:03:47 -0500
Subject: [PATCH 061/108] Implement parse_size() function

---
 include/fc/string.hpp |  2 +
 src/string.cpp        | 85 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 87 insertions(+)

diff --git a/include/fc/string.hpp b/include/fc/string.hpp
index 0ae999b..dc942b9 100644
--- a/include/fc/string.hpp
+++ b/include/fc/string.hpp
@@ -29,6 +29,8 @@ namespace fc
   fc::string trim( const fc::string& );
   fc::string to_lower( const fc::string& );
   string trim_and_normalize_spaces( const string& s );
+
+  uint64_t parse_size( const string& s );
 }
 
 #else
diff --git a/src/string.cpp b/src/string.cpp
index 0b7cb9f..84edb88 100644
--- a/src/string.cpp
+++ b/src/string.cpp
@@ -172,6 +172,91 @@ namespace fc  {
      return result;
   }
 
+  /**
+   * Parses a size including an optional multiplicative suffix.
+   *
+   * M   -> 1024*1024 bytes
+   * MB  -> 1000*1000 bytes
+   * MiB -> 1024*1024 bytes
+   *
+   * The 'M' may be any of KMGTPEZY (upper or lower case)
+   */
+  uint64_t parse_size( const string& s )
+  {
+     try
+     {
+        size_t i = 0, n = s.size(), suffix_start = n;
+        for( i=0; i<n; i++ )
+        {
+           if( !((s[i] >= '0') && (s[i] <= '9')) )
+           {
+              suffix_start = i;
+              break;
+           }
+        }
+        uint64_t u = to_uint64( s.substr( 0, suffix_start ) );
+
+        FC_ASSERT( n - suffix_start <= 3 );
+
+        uint64_t m = 1;
+        uint64_t thousand = 1024;
+
+        if( suffix_start == n )
+        {
+           return u;
+        }
+        else if( suffix_start == n-1 )
+        {
+        }
+        else if( suffix_start == n-2 )
+        {
+           FC_ASSERT( (s[suffix_start+1] == 'b') || (s[suffix_start+1] == 'B') );
+           thousand = 1000;
+        }
+        else if( suffix_start == n-3 )
+        {
+           FC_ASSERT( (s[suffix_start+1] == 'i') || (s[suffix_start+1] == 'I') );
+           FC_ASSERT( (s[suffix_start+2] == 'b') || (s[suffix_start+2] == 'B') );
+        }
+        switch( s[suffix_start] )
+        {
+           case 'y':
+           case 'Y':
+              m *= thousand;
+           case 'z':
+           case 'Z':
+              m *= thousand;
+           case 'e':
+           case 'E':
+              m *= thousand;
+           case 'p':
+           case 'P':
+              m *= thousand;
+           case 't':
+           case 'T':
+              m *= thousand;
+           case 'g':
+           case 'G':
+              m *= thousand;
+           case 'm':
+           case 'M':
+              m *= thousand;
+           case 'k':
+           case 'K':
+              m *= thousand;
+              break;
+           default:
+              FC_ASSERT( false );
+        }
+        return u*m;
+     }
+     catch( const fc::exception& e )
+     {
+        FC_THROW_EXCEPTION( parse_error_exception, "Couldn't parse size" );
+     }
+  }
+
+
 } // namespace fc
 
 

From 50dbc2b13982043407498e4e9055cb7f29a384b5 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Wed, 16 Nov 2016 11:23:33 -0500
Subject: [PATCH 062/108] Add equihash

---
 CMakeLists.txt                                |   6 +-
 include/fc/crypto/equihash.hpp                |  21 +
 src/crypto/equihash.cpp                       |  47 ++
 vendor/equihash/CMakeLists.txt                |  17 +
 .../equihash/include/equihash/blake2-config.h |  72 +++
 .../equihash/include/equihash/blake2-impl.h   | 136 +++++
 vendor/equihash/include/equihash/blake2.h     | 157 ++++++
 .../include/equihash/blake2b-load-sse2.h      |  68 +++
 .../include/equihash/blake2b-load-sse41.h     | 402 +++++++++++++++
 .../equihash/include/equihash/blake2b-round.h | 170 +++++++
 vendor/equihash/include/equihash/pow.hpp      | 117 +++++
 vendor/equihash/src/blake2b.c                 | 469 ++++++++++++++++++
 vendor/equihash/src/pow.cpp                   | 220 ++++++++
 13 files changed, 1901 insertions(+), 1 deletion(-)
 create mode 100644 include/fc/crypto/equihash.hpp
 create mode 100644 src/crypto/equihash.cpp
 create mode 100644 vendor/equihash/CMakeLists.txt
 create mode 100644 vendor/equihash/include/equihash/blake2-config.h
 create mode 100644 vendor/equihash/include/equihash/blake2-impl.h
 create mode 100644 vendor/equihash/include/equihash/blake2.h
 create mode 100644 vendor/equihash/include/equihash/blake2b-load-sse2.h
 create mode 100644 vendor/equihash/include/equihash/blake2b-load-sse41.h
 create mode 100644 vendor/equihash/include/equihash/blake2b-round.h
 create mode 100644 vendor/equihash/include/equihash/pow.hpp
 create mode 100644 vendor/equihash/src/blake2b.c
 create mode 100644 vendor/equihash/src/pow.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6a1ecf..5ad88c8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,6 +220,7 @@ set( fc_sources
      src/crypto/dh.cpp
      src/crypto/blowfish.cpp
      src/crypto/elliptic_common.cpp
+     src/crypto/equihash.cpp
      ${ECC_REST}
      src/crypto/elliptic_${ECC_IMPL}.cpp
      src/crypto/rand.cpp
@@ -253,6 +254,7 @@ list(APPEND sources ${fc_headers})
 
 add_subdirectory( vendor/websocketpp )
 add_subdirectory( vendor/udt4 )
+add_subdirectory( vendor/equihash )
 
 setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY )
 
@@ -354,13 +356,14 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/udt4/src
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
+    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/equihash
   )
 
 #target_link_libraries( fc PUBLIC udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} udt equihash ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
 
 if(MSVC)
   set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
@@ -376,6 +379,7 @@ ENDIF(MSVC)
 ENDIF()
 
 include_directories( vendor/websocketpp )
+include_directories( vendor/equihash )
 
 add_subdirectory(tests)
 
diff --git a/include/fc/crypto/equihash.hpp b/include/fc/crypto/equihash.hpp
new file mode 100644
index 0000000..cf0cb01
--- /dev/null
+++ b/include/fc/crypto/equihash.hpp
@@ -0,0 +1,21 @@
+#pragma once
+#include <fc/crypto/sha256.hpp>
+#include <fc/vector.hpp>
+
+namespace fc { namespace equihash {
+
+   struct proof
+   {
+      uint32_t n;
+      uint32_t k;
+      sha256   seed;
+      std::vector< uint32_t > inputs;
+
+      bool is_valid() const;
+
+      static proof hash( uint32_t n, uint32_t k, sha256 seed );
+   };
+
+} } // fc
+
+FC_REFLECT( fc::equihash::proof, (n)(k)(seed)(inputs) )
diff --git a/src/crypto/equihash.cpp b/src/crypto/equihash.cpp
new file mode 100644
index 0000000..ce855ab
--- /dev/null
+++ b/src/crypto/equihash.cpp
@@ -0,0 +1,47 @@
+#include <equihash/pow.hpp>
+
+#include <fc/crypto/equihash.hpp>
+
+#define EQUIHASH_NONCE 2
+
+namespace fc { namespace equihash {
+
+   _POW::Seed sha_to_seed( sha256 seed )
+   {
+      _POW::Seed new_seed;
+
+      // Seed is 128 bits. Half of sha256 to create seed. Should still have enough randomness
+      new_seed.v[0] =  (unsigned int)  seed._hash[0];
+      new_seed.v[0] ^= (unsigned int)  seed._hash[2];
+      new_seed.v[1] =  (unsigned int)( seed._hash[0] >> 32 );
+      new_seed.v[1] ^= (unsigned int)( seed._hash[2] >> 32 );
+      new_seed.v[2] =  (unsigned int)  seed._hash[1];
+      new_seed.v[2] ^= (unsigned int)  seed._hash[3];
+      new_seed.v[3] =  (unsigned int)( seed._hash[1] >> 32 );
+      new_seed.v[3] ^= (unsigned int)( seed._hash[3] >> 32 );
+
+      return new_seed;
+   }
+
+   bool proof::is_valid() const
+   {
+      _POW::Proof test( n, k, sha_to_seed( seed ), EQUIHASH_NONCE, inputs );
+      return test.Test();
+
+   }
+
+   proof proof::hash( uint32_t n, uint32_t k, sha256 seed )
+   {
+      auto hash = _POW::Equihash( n, k, sha_to_seed( seed ) );
+      auto result = hash.FindProof( EQUIHASH_NONCE );
+
+      proof p;
+      p.n = n;
+      p.k = k;
+      p.seed = seed;
+      p.inputs = result.inputs;
+
+      return p;
+   }
+
+} } // fc::equihash
diff --git a/vendor/equihash/CMakeLists.txt b/vendor/equihash/CMakeLists.txt
new file mode 100644
index 0000000..5ab39e9
--- /dev/null
+++ b/vendor/equihash/CMakeLists.txt
@@ -0,0 +1,17 @@
+file(GLOB HEADERS "include/equihash/*.hpp" )
+
+add_library( equihash
+             src/pow.cpp
+             src/blake2b.c
+           )
+
+target_link_libraries( equihash )
+target_include_directories( equihash PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
+
+install( TARGETS
+   equihash
+
+   RUNTIME DESTINATION bin
+   LIBRARY DESTINATION lib
+   ARCHIVE DESTINATION lib
+)
diff --git a/vendor/equihash/include/equihash/blake2-config.h b/vendor/equihash/include/equihash/blake2-config.h
new file mode 100644
index 0000000..70d61f1
--- /dev/null
+++ b/vendor/equihash/include/equihash/blake2-config.h
@@ -0,0 +1,72 @@
+/*
+   BLAKE2 reference source code package - optimized C implementations
+
+   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along with
+   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+*/
+#pragma once
+#ifndef __BLAKE2_CONFIG_H__
+#define __BLAKE2_CONFIG_H__
+
+// These don't work everywhere
+#if defined(__SSE2__)
+#define HAVE_SSE2
+#endif
+
+#if defined(__SSSE3__)
+#define HAVE_SSSE3
+#endif
+
+#if defined(__SSE4_1__)
+#define HAVE_SSE41
+#endif
+
+#if defined(__AVX__)
+#define HAVE_AVX
+#endif
+
+#if defined(__XOP__)
+#define HAVE_XOP
+#endif
+
+
+#ifdef HAVE_AVX2
+#ifndef HAVE_AVX
+#define HAVE_AVX
+#endif
+#endif
+
+#ifdef HAVE_XOP
+#ifndef HAVE_AVX
+#define HAVE_AVX
+#endif
+#endif
+
+#ifdef HAVE_AVX
+#ifndef HAVE_SSE41
+#define HAVE_SSE41
+#endif
+#endif
+
+#ifdef HAVE_SSE41
+#ifndef HAVE_SSSE3
+#define HAVE_SSSE3
+#endif
+#endif
+
+#ifdef HAVE_SSSE3
+#define HAVE_SSE2
+#endif
+
+#if !defined(HAVE_SSE2)
+#error "This code requires at least SSE2."
+#endif
+
+#endif
+
diff --git a/vendor/equihash/include/equihash/blake2-impl.h b/vendor/equihash/include/equihash/blake2-impl.h
new file mode 100644
index 0000000..16219db
--- /dev/null
+++ b/vendor/equihash/include/equihash/blake2-impl.h
@@ -0,0 +1,136 @@
+/*
+   BLAKE2 reference source code package - optimized C implementations
+
+   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along with
+   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+*/
+#pragma once
+#ifndef __BLAKE2_IMPL_H__
+#define __BLAKE2_IMPL_H__
+
+#include <stdint.h>
+
+static inline uint32_t load32( const void *src )
+{
+#if defined(NATIVE_LITTLE_ENDIAN)
+  uint32_t w;
+  memcpy(&w, src, sizeof w);
+  return w;
+#else
+  const uint8_t *p = ( const uint8_t * )src;
+  uint32_t w = *p++;
+  w |= ( uint32_t )( *p++ ) <<  8;
+  w |= ( uint32_t )( *p++ ) << 16;
+  w |= ( uint32_t )( *p++ ) << 24;
+  return w;
+#endif
+}
+
+static inline uint64_t load64( const void *src )
+{
+#if defined(NATIVE_LITTLE_ENDIAN)
+  uint64_t w;
+  memcpy(&w, src, sizeof w);
+  return w;
+#else
+  const uint8_t *p = ( const uint8_t * )src;
+  uint64_t w = *p++;
+  w |= ( uint64_t )( *p++ ) <<  8;
+  w |= ( uint64_t )( *p++ ) << 16;
+  w |= ( uint64_t )( *p++ ) << 24;
+  w |= ( uint64_t )( *p++ ) << 32;
+  w |= ( uint64_t )( *p++ ) << 40;
+  w |= ( uint64_t )( *p++ ) << 48;
+  w |= ( uint64_t )( *p++ ) << 56;
+  return w;
+#endif
+}
+
+static inline void store32( void *dst, uint32_t w )
+{
+#if defined(NATIVE_LITTLE_ENDIAN)
+  memcpy(dst, &w, sizeof w);
+#else
+  uint8_t *p = ( uint8_t * )dst;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w;
+#endif
+}
+
+static inline void store64( void *dst, uint64_t w )
+{
+#if defined(NATIVE_LITTLE_ENDIAN)
+  memcpy(dst, &w, sizeof w);
+#else
+  uint8_t *p = ( uint8_t * )dst;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w;
+#endif
+}
+
+static inline uint64_t load48( const void *src )
+{
+  const uint8_t *p = ( const uint8_t * )src;
+  uint64_t w = *p++;
+  w |= ( uint64_t )( *p++ ) <<  8;
+  w |= ( uint64_t )( *p++ ) << 16;
+  w |= ( uint64_t )( *p++ ) << 24;
+  w |= ( uint64_t )( *p++ ) << 32;
+  w |= ( uint64_t )( *p++ ) << 40;
+  return w;
+}
+
+static inline void store48( void *dst, uint64_t w )
+{
+  uint8_t *p = ( uint8_t * )dst;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w; w >>= 8;
+  *p++ = ( uint8_t )w;
+}
+
+static inline uint32_t rotl32( const uint32_t w, const unsigned c )
+{
+  return ( w << c ) | ( w >> ( 32 - c ) );
+}
+
+static inline uint64_t rotl64( const uint64_t w, const unsigned c )
+{
+  return ( w << c ) | ( w >> ( 64 - c ) );
+}
+
+static inline uint32_t rotr32( const uint32_t w, const unsigned c )
+{
+  return ( w >> c ) | ( w << ( 32 - c ) );
+}
+
+static inline uint64_t rotr64( const uint64_t w, const unsigned c )
+{
+  return ( w >> c ) | ( w << ( 64 - c ) );
+}
+
+/* prevents compiler optimizing out memset() */
+static inline void secure_zero_memory( void *v, size_t n )
+{
+  volatile uint8_t *p = ( volatile uint8_t * )v;
+  while( n-- ) *p++ = 0;
+}
+
+#endif
+
diff --git a/vendor/equihash/include/equihash/blake2.h b/vendor/equihash/include/equihash/blake2.h
new file mode 100644
index 0000000..424e145
--- /dev/null
+++ b/vendor/equihash/include/equihash/blake2.h
@@ -0,0 +1,157 @@
+/*
+   BLAKE2 reference source code package - optimized C implementations
+
+   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along with
+   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+*/
+#pragma once
+#ifndef __BLAKE2_H__
+#define __BLAKE2_H__
+
+#include <stddef.h>
+#include <stdint.h>
+
+#if defined(_MSC_VER)
+#define ALIGN(x) __declspec(align(x))
+#else
+#define ALIGN(x) __attribute__ ((__aligned__(x)))
+#endif
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+  enum blake2s_constant
+  {
+    BLAKE2S_BLOCKBYTES = 64,
+    BLAKE2S_OUTBYTES   = 32,
+    BLAKE2S_KEYBYTES   = 32,
+    BLAKE2S_SALTBYTES  = 8,
+    BLAKE2S_PERSONALBYTES = 8
+  };
+
+  enum blake2b_constant
+  {
+    BLAKE2B_BLOCKBYTES = 128,
+    BLAKE2B_OUTBYTES   = 64,
+    BLAKE2B_KEYBYTES   = 64,
+    BLAKE2B_SALTBYTES  = 16,
+    BLAKE2B_PERSONALBYTES = 16
+  };
+
+#pragma pack(push, 1)
+  typedef struct __blake2s_param
+  {
+    uint8_t  digest_length; // 1
+    uint8_t  key_length;    // 2
+    uint8_t  fanout;        // 3
+    uint8_t  depth;         // 4
+    uint32_t leaf_length;   // 8
+    uint8_t  node_offset[6];// 14
+    uint8_t  node_depth;    // 15
+    uint8_t  inner_length;  // 16
+    // uint8_t  reserved[0];
+    uint8_t  salt[BLAKE2S_SALTBYTES]; // 24
+    uint8_t  personal[BLAKE2S_PERSONALBYTES];  // 32
+  } blake2s_param;
+
+  ALIGN( 64 ) typedef struct __blake2s_state
+  {
+    uint32_t h[8];
+    uint32_t t[2];
+    uint32_t f[2];
+    uint8_t  buf[2 * BLAKE2S_BLOCKBYTES];
+    size_t   buflen;
+    uint8_t  last_node;
+  } blake2s_state;
+
+  typedef struct __blake2b_param
+  {
+    uint8_t  digest_length; // 1
+    uint8_t  key_length;    // 2
+    uint8_t  fanout;        // 3
+    uint8_t  depth;         // 4
+    uint32_t leaf_length;   // 8
+    uint64_t node_offset;   // 16
+    uint8_t  node_depth;    // 17
+    uint8_t  inner_length;  // 18
+    uint8_t  reserved[14];  // 32
+    uint8_t  salt[BLAKE2B_SALTBYTES]; // 48
+    uint8_t  personal[BLAKE2B_PERSONALBYTES];  // 64
+  } blake2b_param;
+
+  ALIGN( 64 ) typedef struct __blake2b_state
+  {
+    uint64_t h[8];
+    uint64_t t[2];
+    uint64_t f[2];
+    uint8_t  buf[2 * BLAKE2B_BLOCKBYTES];
+    size_t   buflen;
+    uint8_t  last_node;
+  } blake2b_state;
+
+  ALIGN( 64 ) typedef struct __blake2sp_state
+  {
+    blake2s_state S[8][1];
+    blake2s_state R[1];
+    uint8_t buf[8 * BLAKE2S_BLOCKBYTES];
+    size_t  buflen;
+  } blake2sp_state;
+
+  ALIGN( 64 ) typedef struct __blake2bp_state
+  {
+    blake2b_state S[4][1];
+    blake2b_state R[1];
+    uint8_t buf[4 * BLAKE2B_BLOCKBYTES];
+    size_t  buflen;
+  } blake2bp_state;
+#pragma pack(pop)
+
+  // Streaming API
+  int blake2s_init( blake2s_state *S, const uint8_t outlen );
+  int blake2s_init_key( blake2s_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
+  int blake2s_init_param( blake2s_state *S, const blake2s_param *P );
+  int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen );
+  int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen );
+
+  int blake2b_init( blake2b_state *S, const uint8_t outlen );
+  int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
+  int blake2b_init_param( blake2b_state *S, const blake2b_param *P );
+  int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen );
+  int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen );
+
+  int blake2sp_init( blake2sp_state *S, const uint8_t outlen );
+  int blake2sp_init_key( blake2sp_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
+  int blake2sp_update( blake2sp_state *S, const uint8_t *in, uint64_t inlen );
+  int blake2sp_final( blake2sp_state *S, uint8_t *out, uint8_t outlen );
+
+  int blake2bp_init( blake2bp_state *S, const uint8_t outlen );
+  int blake2bp_init_key( blake2bp_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
+  int blake2bp_update( blake2bp_state *S, const uint8_t *in, uint64_t inlen );
+  int blake2bp_final( blake2bp_state *S, uint8_t *out, uint8_t outlen );
+
+  // Simple API
+  int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
+  int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
+  int blake2b_long(uint8_t *out, const void *in, const uint32_t outlen, const uint64_t inlen);
+
+  int blake2sp( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
+  int blake2bp( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
+
+  static inline int blake2( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen )
+  {
+    return blake2b( out, in, key, outlen, inlen, keylen );
+  }
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif
+
diff --git a/vendor/equihash/include/equihash/blake2b-load-sse2.h b/vendor/equihash/include/equihash/blake2b-load-sse2.h
new file mode 100644
index 0000000..1ba153c
--- /dev/null
+++ b/vendor/equihash/include/equihash/blake2b-load-sse2.h
@@ -0,0 +1,68 @@
+/*
+   BLAKE2 reference source code package - optimized C implementations
+
+   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along with
+   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+*/
+#pragma once
+#ifndef __BLAKE2B_LOAD_SSE2_H__
+#define __BLAKE2B_LOAD_SSE2_H__
+
+#define LOAD_MSG_0_1(b0, b1) b0 = _mm_set_epi64x(m2, m0); b1 = _mm_set_epi64x(m6, m4)
+#define LOAD_MSG_0_2(b0, b1) b0 = _mm_set_epi64x(m3, m1); b1 = _mm_set_epi64x(m7, m5)
+#define LOAD_MSG_0_3(b0, b1) b0 = _mm_set_epi64x(m10, m8); b1 = _mm_set_epi64x(m14, m12)
+#define LOAD_MSG_0_4(b0, b1) b0 = _mm_set_epi64x(m11, m9); b1 = _mm_set_epi64x(m15, m13)
+#define LOAD_MSG_1_1(b0, b1) b0 = _mm_set_epi64x(m4, m14); b1 = _mm_set_epi64x(m13, m9)
+#define LOAD_MSG_1_2(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m6, m15)
+#define LOAD_MSG_1_3(b0, b1) b0 = _mm_set_epi64x(m0, m1); b1 = _mm_set_epi64x(m5, m11)
+#define LOAD_MSG_1_4(b0, b1) b0 = _mm_set_epi64x(m2, m12); b1 = _mm_set_epi64x(m3, m7)
+#define LOAD_MSG_2_1(b0, b1) b0 = _mm_set_epi64x(m12, m11); b1 = _mm_set_epi64x(m15, m5)
+#define LOAD_MSG_2_2(b0, b1) b0 = _mm_set_epi64x(m0, m8); b1 = _mm_set_epi64x(m13, m2)
+#define LOAD_MSG_2_3(b0, b1) b0 = _mm_set_epi64x(m3, m10); b1 = _mm_set_epi64x(m9, m7)
+#define LOAD_MSG_2_4(b0, b1) b0 = _mm_set_epi64x(m6, m14); b1 = _mm_set_epi64x(m4, m1)
+#define LOAD_MSG_3_1(b0, b1) b0 = _mm_set_epi64x(m3, m7); b1 = _mm_set_epi64x(m11, m13)
+#define LOAD_MSG_3_2(b0, b1) b0 = _mm_set_epi64x(m1, m9); b1 = _mm_set_epi64x(m14, m12)
+#define LOAD_MSG_3_3(b0, b1) b0 = _mm_set_epi64x(m5, m2); b1 = _mm_set_epi64x(m15, m4)
+#define LOAD_MSG_3_4(b0, b1) b0 = _mm_set_epi64x(m10, m6); b1 = _mm_set_epi64x(m8, m0)
+#define LOAD_MSG_4_1(b0, b1) b0 = _mm_set_epi64x(m5, m9); b1 = _mm_set_epi64x(m10, m2)
+#define LOAD_MSG_4_2(b0, b1) b0 = _mm_set_epi64x(m7, m0); b1 = _mm_set_epi64x(m15, m4)
+#define LOAD_MSG_4_3(b0, b1) b0 = _mm_set_epi64x(m11, m14); b1 = _mm_set_epi64x(m3, m6)
+#define LOAD_MSG_4_4(b0, b1) b0 = _mm_set_epi64x(m12, m1); b1 = _mm_set_epi64x(m13, m8)
+#define LOAD_MSG_5_1(b0, b1) b0 = _mm_set_epi64x(m6, m2); b1 = _mm_set_epi64x(m8, m0)
+#define LOAD_MSG_5_2(b0, b1) b0 = _mm_set_epi64x(m10, m12); b1 = _mm_set_epi64x(m3, m11)
+#define LOAD_MSG_5_3(b0, b1) b0 = _mm_set_epi64x(m7, m4); b1 = _mm_set_epi64x(m1, m15)
+#define LOAD_MSG_5_4(b0, b1) b0 = _mm_set_epi64x(m5, m13); b1 = _mm_set_epi64x(m9, m14)
+#define LOAD_MSG_6_1(b0, b1) b0 = _mm_set_epi64x(m1, m12); b1 = _mm_set_epi64x(m4, m14)
+#define LOAD_MSG_6_2(b0, b1) b0 = _mm_set_epi64x(m15, m5); b1 = _mm_set_epi64x(m10, m13)
+#define LOAD_MSG_6_3(b0, b1) b0 = _mm_set_epi64x(m6, m0); b1 = _mm_set_epi64x(m8, m9)
+#define LOAD_MSG_6_4(b0, b1) b0 = _mm_set_epi64x(m3, m7); b1 = _mm_set_epi64x(m11, m2)
+#define LOAD_MSG_7_1(b0, b1) b0 = _mm_set_epi64x(m7, m13); b1 = _mm_set_epi64x(m3, m12)
+#define LOAD_MSG_7_2(b0, b1) b0 = _mm_set_epi64x(m14, m11); b1 = _mm_set_epi64x(m9, m1)
+#define LOAD_MSG_7_3(b0, b1) b0 = _mm_set_epi64x(m15, m5); b1 = _mm_set_epi64x(m2, m8)
+#define LOAD_MSG_7_4(b0, b1) b0 = _mm_set_epi64x(m4, m0); b1 = _mm_set_epi64x(m10, m6)
+#define LOAD_MSG_8_1(b0, b1) b0 = _mm_set_epi64x(m14, m6); b1 = _mm_set_epi64x(m0, m11)
+#define LOAD_MSG_8_2(b0, b1) b0 = _mm_set_epi64x(m9, m15); b1 = _mm_set_epi64x(m8, m3)
+#define LOAD_MSG_8_3(b0, b1) b0 = _mm_set_epi64x(m13, m12); b1 = _mm_set_epi64x(m10, m1)
+#define LOAD_MSG_8_4(b0, b1) b0 = _mm_set_epi64x(m7, m2); b1 = _mm_set_epi64x(m5, m4)
+#define LOAD_MSG_9_1(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m1, m7)
+#define LOAD_MSG_9_2(b0, b1) b0 = _mm_set_epi64x(m4, m2); b1 = _mm_set_epi64x(m5, m6)
+#define LOAD_MSG_9_3(b0, b1) b0 = _mm_set_epi64x(m9, m15); b1 = _mm_set_epi64x(m13, m3)
+#define LOAD_MSG_9_4(b0, b1) b0 = _mm_set_epi64x(m14, m11); b1 = _mm_set_epi64x(m0, m12)
+#define LOAD_MSG_10_1(b0, b1) b0 = _mm_set_epi64x(m2, m0); b1 = _mm_set_epi64x(m6, m4)
+#define LOAD_MSG_10_2(b0, b1) b0 = _mm_set_epi64x(m3, m1); b1 = _mm_set_epi64x(m7, m5)
+#define LOAD_MSG_10_3(b0, b1) b0 = _mm_set_epi64x(m10, m8); b1 = _mm_set_epi64x(m14, m12)
+#define LOAD_MSG_10_4(b0, b1) b0 = _mm_set_epi64x(m11, m9); b1 = _mm_set_epi64x(m15, m13)
+#define LOAD_MSG_11_1(b0, b1) b0 = _mm_set_epi64x(m4, m14); b1 = _mm_set_epi64x(m13, m9)
+#define LOAD_MSG_11_2(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m6, m15)
+#define LOAD_MSG_11_3(b0, b1) b0 = _mm_set_epi64x(m0, m1); b1 = _mm_set_epi64x(m5, m11)
+#define LOAD_MSG_11_4(b0, b1) b0 = _mm_set_epi64x(m2, m12); b1 = _mm_set_epi64x(m3, m7)
+
+
+#endif
+
diff --git a/vendor/equihash/include/equihash/blake2b-load-sse41.h b/vendor/equihash/include/equihash/blake2b-load-sse41.h
new file mode 100644
index 0000000..f6c1bc8
--- /dev/null
+++ b/vendor/equihash/include/equihash/blake2b-load-sse41.h
@@ -0,0 +1,402 @@
+/*
+   BLAKE2 reference source code package - optimized C implementations
+
+   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along with
+   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+*/
+#pragma once
+#ifndef __BLAKE2B_LOAD_SSE41_H__
+#define __BLAKE2B_LOAD_SSE41_H__
+
+#define LOAD_MSG_0_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m0, m1); \
+b1 = _mm_unpacklo_epi64(m2, m3); \
+} while(0)
+
+
+#define LOAD_MSG_0_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m0, m1); \
+b1 = _mm_unpackhi_epi64(m2, m3); \
+} while(0)
+
+
+#define LOAD_MSG_0_3(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m4, m5); \
+b1 = _mm_unpacklo_epi64(m6, m7); \
+} while(0)
+
+
+#define LOAD_MSG_0_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m4, m5); \
+b1 = _mm_unpackhi_epi64(m6, m7); \
+} while(0)
+
+
+#define LOAD_MSG_1_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m7, m2); \
+b1 = _mm_unpackhi_epi64(m4, m6); \
+} while(0)
+
+
+#define LOAD_MSG_1_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m5, m4); \
+b1 = _mm_alignr_epi8(m3, m7, 8); \
+} while(0)
+
+
+#define LOAD_MSG_1_3(b0, b1) \
+do \
+{ \
+b0 = _mm_shuffle_epi32(m0, _MM_SHUFFLE(1,0,3,2)); \
+b1 = _mm_unpackhi_epi64(m5, m2); \
+} while(0)
+
+
+#define LOAD_MSG_1_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m6, m1); \
+b1 = _mm_unpackhi_epi64(m3, m1); \
+} while(0)
+
+
+#define LOAD_MSG_2_1(b0, b1) \
+do \
+{ \
+b0 = _mm_alignr_epi8(m6, m5, 8); \
+b1 = _mm_unpackhi_epi64(m2, m7); \
+} while(0)
+
+
+#define LOAD_MSG_2_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m4, m0); \
+b1 = _mm_blend_epi16(m1, m6, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_2_3(b0, b1) \
+do \
+{ \
+b0 = _mm_blend_epi16(m5, m1, 0xF0); \
+b1 = _mm_unpackhi_epi64(m3, m4); \
+} while(0)
+
+
+#define LOAD_MSG_2_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m7, m3); \
+b1 = _mm_alignr_epi8(m2, m0, 8); \
+} while(0)
+
+
+#define LOAD_MSG_3_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m3, m1); \
+b1 = _mm_unpackhi_epi64(m6, m5); \
+} while(0)
+
+
+#define LOAD_MSG_3_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m4, m0); \
+b1 = _mm_unpacklo_epi64(m6, m7); \
+} while(0)
+
+
+#define LOAD_MSG_3_3(b0, b1) \
+do \
+{ \
+b0 = _mm_blend_epi16(m1, m2, 0xF0); \
+b1 = _mm_blend_epi16(m2, m7, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_3_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m3, m5); \
+b1 = _mm_unpacklo_epi64(m0, m4); \
+} while(0)
+
+
+#define LOAD_MSG_4_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m4, m2); \
+b1 = _mm_unpacklo_epi64(m1, m5); \
+} while(0)
+
+
+#define LOAD_MSG_4_2(b0, b1) \
+do \
+{ \
+b0 = _mm_blend_epi16(m0, m3, 0xF0); \
+b1 = _mm_blend_epi16(m2, m7, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_4_3(b0, b1) \
+do \
+{ \
+b0 = _mm_blend_epi16(m7, m5, 0xF0); \
+b1 = _mm_blend_epi16(m3, m1, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_4_4(b0, b1) \
+do \
+{ \
+b0 = _mm_alignr_epi8(m6, m0, 8); \
+b1 = _mm_blend_epi16(m4, m6, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_5_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m1, m3); \
+b1 = _mm_unpacklo_epi64(m0, m4); \
+} while(0)
+
+
+#define LOAD_MSG_5_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m6, m5); \
+b1 = _mm_unpackhi_epi64(m5, m1); \
+} while(0)
+
+
+#define LOAD_MSG_5_3(b0, b1) \
+do \
+{ \
+b0 = _mm_blend_epi16(m2, m3, 0xF0); \
+b1 = _mm_unpackhi_epi64(m7, m0); \
+} while(0)
+
+
+#define LOAD_MSG_5_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m6, m2); \
+b1 = _mm_blend_epi16(m7, m4, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_6_1(b0, b1) \
+do \
+{ \
+b0 = _mm_blend_epi16(m6, m0, 0xF0); \
+b1 = _mm_unpacklo_epi64(m7, m2); \
+} while(0)
+
+
+#define LOAD_MSG_6_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m2, m7); \
+b1 = _mm_alignr_epi8(m5, m6, 8); \
+} while(0)
+
+
+#define LOAD_MSG_6_3(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m0, m3); \
+b1 = _mm_shuffle_epi32(m4, _MM_SHUFFLE(1,0,3,2)); \
+} while(0)
+
+
+#define LOAD_MSG_6_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m3, m1); \
+b1 = _mm_blend_epi16(m1, m5, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_7_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m6, m3); \
+b1 = _mm_blend_epi16(m6, m1, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_7_2(b0, b1) \
+do \
+{ \
+b0 = _mm_alignr_epi8(m7, m5, 8); \
+b1 = _mm_unpackhi_epi64(m0, m4); \
+} while(0)
+
+
+#define LOAD_MSG_7_3(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m2, m7); \
+b1 = _mm_unpacklo_epi64(m4, m1); \
+} while(0)
+
+
+#define LOAD_MSG_7_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m0, m2); \
+b1 = _mm_unpacklo_epi64(m3, m5); \
+} while(0)
+
+
+#define LOAD_MSG_8_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m3, m7); \
+b1 = _mm_alignr_epi8(m0, m5, 8); \
+} while(0)
+
+
+#define LOAD_MSG_8_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m7, m4); \
+b1 = _mm_alignr_epi8(m4, m1, 8); \
+} while(0)
+
+
+#define LOAD_MSG_8_3(b0, b1) \
+do \
+{ \
+b0 = m6; \
+b1 = _mm_alignr_epi8(m5, m0, 8); \
+} while(0)
+
+
+#define LOAD_MSG_8_4(b0, b1) \
+do \
+{ \
+b0 = _mm_blend_epi16(m1, m3, 0xF0); \
+b1 = m2; \
+} while(0)
+
+
+#define LOAD_MSG_9_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m5, m4); \
+b1 = _mm_unpackhi_epi64(m3, m0); \
+} while(0)
+
+
+#define LOAD_MSG_9_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m1, m2); \
+b1 = _mm_blend_epi16(m3, m2, 0xF0); \
+} while(0)
+
+
+#define LOAD_MSG_9_3(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m7, m4); \
+b1 = _mm_unpackhi_epi64(m1, m6); \
+} while(0)
+
+
+#define LOAD_MSG_9_4(b0, b1) \
+do \
+{ \
+b0 = _mm_alignr_epi8(m7, m5, 8); \
+b1 = _mm_unpacklo_epi64(m6, m0); \
+} while(0)
+
+
+#define LOAD_MSG_10_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m0, m1); \
+b1 = _mm_unpacklo_epi64(m2, m3); \
+} while(0)
+
+
+#define LOAD_MSG_10_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m0, m1); \
+b1 = _mm_unpackhi_epi64(m2, m3); \
+} while(0)
+
+
+#define LOAD_MSG_10_3(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m4, m5); \
+b1 = _mm_unpacklo_epi64(m6, m7); \
+} while(0)
+
+
+#define LOAD_MSG_10_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpackhi_epi64(m4, m5); \
+b1 = _mm_unpackhi_epi64(m6, m7); \
+} while(0)
+
+
+#define LOAD_MSG_11_1(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m7, m2); \
+b1 = _mm_unpackhi_epi64(m4, m6); \
+} while(0)
+
+
+#define LOAD_MSG_11_2(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m5, m4); \
+b1 = _mm_alignr_epi8(m3, m7, 8); \
+} while(0)
+
+
+#define LOAD_MSG_11_3(b0, b1) \
+do \
+{ \
+b0 = _mm_shuffle_epi32(m0, _MM_SHUFFLE(1,0,3,2)); \
+b1 = _mm_unpackhi_epi64(m5, m2); \
+} while(0)
+
+
+#define LOAD_MSG_11_4(b0, b1) \
+do \
+{ \
+b0 = _mm_unpacklo_epi64(m6, m1); \
+b1 = _mm_unpackhi_epi64(m3, m1); \
+} while(0)
+
+
+#endif
+
diff --git a/vendor/equihash/include/equihash/blake2b-round.h b/vendor/equihash/include/equihash/blake2b-round.h
new file mode 100644
index 0000000..75aad89
--- /dev/null
+++ b/vendor/equihash/include/equihash/blake2b-round.h
@@ -0,0 +1,170 @@
+/*
+   BLAKE2 reference source code package - optimized C implementations
+
+   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along with
+   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+*/
+#pragma once
+#ifndef __BLAKE2B_ROUND_H__
+#define __BLAKE2B_ROUND_H__
+
+#define LOAD(p)  _mm_load_si128( (const __m128i *)(p) )
+#define STORE(p,r) _mm_store_si128((__m128i *)(p), r)
+
+#define LOADU(p)  _mm_loadu_si128( (const __m128i *)(p) )
+#define STOREU(p,r) _mm_storeu_si128((__m128i *)(p), r)
+
+#define TOF(reg) _mm_castsi128_ps((reg))
+#define TOI(reg) _mm_castps_si128((reg))
+
+#define LIKELY(x) __builtin_expect((x),1)
+
+
+/* Microarchitecture-specific macros */
+#ifndef HAVE_XOP
+#ifdef HAVE_SSSE3
+#define _mm_roti_epi64(x, c) \
+    (-(c) == 32) ? _mm_shuffle_epi32((x), _MM_SHUFFLE(2,3,0,1))  \
+    : (-(c) == 24) ? _mm_shuffle_epi8((x), r24) \
+    : (-(c) == 16) ? _mm_shuffle_epi8((x), r16) \
+    : (-(c) == 63) ? _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_add_epi64((x), (x)))  \
+    : _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_slli_epi64((x), 64-(-(c))))
+#else
+#define _mm_roti_epi64(r, c) _mm_xor_si128(_mm_srli_epi64( (r), -(c) ),_mm_slli_epi64( (r), 64-(-c) ))
+#endif
+#else
+/* ... */
+#endif
+
+
+
+#define G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \
+  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l); \
+  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h); \
+  \
+  row4l = _mm_xor_si128(row4l, row1l); \
+  row4h = _mm_xor_si128(row4h, row1h); \
+  \
+  row4l = _mm_roti_epi64(row4l, -32); \
+  row4h = _mm_roti_epi64(row4h, -32); \
+  \
+  row3l = _mm_add_epi64(row3l, row4l); \
+  row3h = _mm_add_epi64(row3h, row4h); \
+  \
+  row2l = _mm_xor_si128(row2l, row3l); \
+  row2h = _mm_xor_si128(row2h, row3h); \
+  \
+  row2l = _mm_roti_epi64(row2l, -24); \
+  row2h = _mm_roti_epi64(row2h, -24); \
+
+#define G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \
+  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l); \
+  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h); \
+  \
+  row4l = _mm_xor_si128(row4l, row1l); \
+  row4h = _mm_xor_si128(row4h, row1h); \
+  \
+  row4l = _mm_roti_epi64(row4l, -16); \
+  row4h = _mm_roti_epi64(row4h, -16); \
+  \
+  row3l = _mm_add_epi64(row3l, row4l); \
+  row3h = _mm_add_epi64(row3h, row4h); \
+  \
+  row2l = _mm_xor_si128(row2l, row3l); \
+  row2h = _mm_xor_si128(row2h, row3h); \
+  \
+  row2l = _mm_roti_epi64(row2l, -63); \
+  row2h = _mm_roti_epi64(row2h, -63); \
+
+#if defined(HAVE_SSSE3)
+#define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
+  t0 = _mm_alignr_epi8(row2h, row2l, 8); \
+  t1 = _mm_alignr_epi8(row2l, row2h, 8); \
+  row2l = t0; \
+  row2h = t1; \
+  \
+  t0 = row3l; \
+  row3l = row3h; \
+  row3h = t0;    \
+  \
+  t0 = _mm_alignr_epi8(row4h, row4l, 8); \
+  t1 = _mm_alignr_epi8(row4l, row4h, 8); \
+  row4l = t1; \
+  row4h = t0;
+
+#define UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
+  t0 = _mm_alignr_epi8(row2l, row2h, 8); \
+  t1 = _mm_alignr_epi8(row2h, row2l, 8); \
+  row2l = t0; \
+  row2h = t1; \
+  \
+  t0 = row3l; \
+  row3l = row3h; \
+  row3h = t0; \
+  \
+  t0 = _mm_alignr_epi8(row4l, row4h, 8); \
+  t1 = _mm_alignr_epi8(row4h, row4l, 8); \
+  row4l = t1; \
+  row4h = t0;
+#else
+
+#define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
+  t0 = row4l;\
+  t1 = row2l;\
+  row4l = row3l;\
+  row3l = row3h;\
+  row3h = row4l;\
+  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0)); \
+  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h)); \
+  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h)); \
+  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1))
+
+#define UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
+  t0 = row3l;\
+  row3l = row3h;\
+  row3h = t0;\
+  t0 = row2l;\
+  t1 = row4l;\
+  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l)); \
+  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h)); \
+  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h)); \
+  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1))
+
+#endif
+
+#if defined(HAVE_SSE41)
+#include <equihash/blake2b-load-sse41.h>
+#else
+#include <equihash/blake2b-load-sse2.h>
+#endif
+
+#define ROUND(r) \
+  LOAD_MSG_ ##r ##_1(b0, b1); \
+  G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+  LOAD_MSG_ ##r ##_2(b0, b1); \
+  G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+  DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h); \
+  LOAD_MSG_ ##r ##_3(b0, b1); \
+  G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+  LOAD_MSG_ ##r ##_4(b0, b1); \
+  G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
+  UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h);
+
+#endif
+
+#define BLAKE2_ROUND(row1l,row1h,row2l,row2h,row3l,row3h,row4l,row4h) \
+	G1(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
+	G2(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
+	\
+	DIAGONALIZE(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
+	\
+	G1(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
+	G2(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
+	\
+	UNDIAGONALIZE(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h);
diff --git a/vendor/equihash/include/equihash/pow.hpp b/vendor/equihash/include/equihash/pow.hpp
new file mode 100644
index 0000000..8ac904e
--- /dev/null
+++ b/vendor/equihash/include/equihash/pow.hpp
@@ -0,0 +1,117 @@
+/*Code by Dmitry Khovratovich, 2016
+CC0 license
+*/
+
+#ifndef __POW
+#define __POW
+
+#include <cstdint>
+
+#include <vector>
+#include <cstdio>
+
+
+const int SEED_LENGTH=4; //Length of seed in dwords ;
+const int NONCE_LENGTH=24; //Length of nonce in bytes;
+const int MAX_NONCE = 0xFFFFF;
+const int MAX_N = 32; //Max length of n in bytes, should not exceed 32
+const int LIST_LENGTH = 5;
+const unsigned FORK_MULTIPLIER=3; //Maximum collision factor
+
+/* The block used to initialize the PoW search
+   @v actual values
+*/
+namespace _POW{
+
+	struct Seed{
+		std::vector<uint32_t> v;
+
+		Seed(){
+			v.resize(SEED_LENGTH,0);
+		}
+		explicit Seed(uint32_t x){
+            v.resize(SEED_LENGTH, x);
+		}
+		Seed(const Seed&r){
+			v= r.v;
+		}
+		Seed& operator=(const Seed&r){
+			v = r.v;
+            return *this;
+		}
+        const uint32_t& operator[](unsigned i) const{ return v[i]; }
+	};
+
+	/* Different nonces for PoW search
+	   @v actual values
+	   */
+    typedef uint32_t Nonce;
+    typedef uint32_t Input;
+
+	/*Actual proof of work
+	*
+	*
+	*
+	*/
+	struct Proof{
+		const unsigned n;
+		const unsigned k;
+		const Seed seed;
+		const Nonce nonce;
+		const std::vector<Input> inputs;
+        Proof(unsigned n_v, unsigned k_v, Seed I_v, Nonce V_v, std::vector<Input> inputs_v):
+        n(n_v), k(k_v), seed(I_v), nonce(V_v), inputs(inputs_v){};
+        Proof():n(0),k(1),seed(0),nonce(0),inputs(std::vector<Input>()) {};
+
+        bool Test();
+	};
+
+    class Tuple {
+    public:
+        std::vector<uint32_t> blocks;
+        Input reference;
+        Tuple(unsigned i) { blocks.resize(i); }
+        Tuple& operator=(const Tuple &r) {
+            blocks = r.blocks;
+            reference = r.reference;
+            return *this;
+        }
+    };
+
+    class Fork {
+    public:
+        Input ref1, ref2;
+        Fork() {};
+        Fork(Input r1, Input r2) : ref1(r1), ref2(r2) {};
+    };
+
+	/*Algorithm class for creating proof
+    Assumes that n/(k+1) <=32
+	*
+	*/
+	class Equihash{
+        std::vector<std::vector<Tuple>> tupleList;
+        std::vector<unsigned> filledList;
+        std::vector<Proof> solutions;
+        std::vector<std::vector<Fork>> forks;
+        unsigned n;
+        unsigned k;
+        Seed seed;
+        Nonce nonce;
+	public:
+        /*
+        Initializes memory.
+        */
+        Equihash(unsigned n_in, unsigned k_in, Seed s) :n(n_in), k(k_in), seed(s) {};
+        ~Equihash() {};
+		  Proof FindProof();
+        Proof FindProof( Nonce n );
+        void FillMemory(uint32_t length);      //fill with hash
+        void InitializeMemory(); //allocate memory
+        void ResolveCollisions(bool store);
+        std::vector<Input> ResolveTree(Fork fork);
+        std::vector<Input> ResolveTreeByLevel(Fork fork, unsigned level);
+	};
+}
+
+#endif //define __POW
diff --git a/vendor/equihash/src/blake2b.c b/vendor/equihash/src/blake2b.c
new file mode 100644
index 0000000..e08562e
--- /dev/null
+++ b/vendor/equihash/src/blake2b.c
@@ -0,0 +1,469 @@
+/*
+   BLAKE2 reference source code package - optimized C implementations
+
+   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
+
+   To the extent possible under law, the author(s) have dedicated all copyright
+   and related and neighboring rights to this software to the public domain
+   worldwide. This software is distributed without any warranty.
+
+   You should have received a copy of the CC0 Public Domain Dedication along with
+   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+*/
+
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <equihash/blake2.h>
+#include <equihash/blake2-impl.h>
+
+#include <equihash/blake2-config.h>
+
+
+#include <emmintrin.h>
+#if defined(HAVE_SSSE3)
+#include <tmmintrin.h>
+#endif
+#if defined(HAVE_SSE41)
+#include <smmintrin.h>
+#endif
+#if defined(HAVE_AVX)
+#include <immintrin.h>
+#endif
+#if defined(HAVE_XOP)
+#include <x86intrin.h>
+#endif
+
+#include <equihash/blake2b-round.h>
+
+ALIGN( 64 ) static const uint64_t blake2b_IV[8] =
+{
+  0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
+  0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
+  0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
+  0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
+};
+
+static const uint8_t blake2b_sigma[12][16] =
+{
+  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
+  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
+  { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
+  {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
+  {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
+  {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
+  { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
+  { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
+  {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
+  { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
+  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
+  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
+};
+
+
+/* Some helper functions, not necessarily useful */
+static inline int blake2b_set_lastnode( blake2b_state *S )
+{
+  S->f[1] = ~0ULL;
+  return 0;
+}
+
+static inline int blake2b_clear_lastnode( blake2b_state *S )
+{
+  S->f[1] = 0ULL;
+  return 0;
+}
+
+static inline int blake2b_set_lastblock( blake2b_state *S )
+{
+  if( S->last_node ) blake2b_set_lastnode( S );
+
+  S->f[0] = ~0ULL;
+  return 0;
+}
+
+static inline int blake2b_clear_lastblock( blake2b_state *S )
+{
+  if( S->last_node ) blake2b_clear_lastnode( S );
+
+  S->f[0] = 0ULL;
+  return 0;
+}
+
+
+static inline int blake2b_increment_counter( blake2b_state *S, const uint64_t inc )
+{
+#if __x86_64__
+  // ADD/ADC chain
+  __uint128_t t = ( ( __uint128_t )S->t[1] << 64 ) | S->t[0];
+  t += inc;
+  S->t[0] = ( uint64_t )( t >>  0 );
+  S->t[1] = ( uint64_t )( t >> 64 );
+#else
+  S->t[0] += inc;
+  S->t[1] += ( S->t[0] < inc );
+#endif
+  return 0;
+}
+
+
+// Parameter-related functions
+static inline int blake2b_param_set_digest_length( blake2b_param *P, const uint8_t digest_length )
+{
+  P->digest_length = digest_length;
+  return 0;
+}
+
+static inline int blake2b_param_set_fanout( blake2b_param *P, const uint8_t fanout )
+{
+  P->fanout = fanout;
+  return 0;
+}
+
+static inline int blake2b_param_set_max_depth( blake2b_param *P, const uint8_t depth )
+{
+  P->depth = depth;
+  return 0;
+}
+
+static inline int blake2b_param_set_leaf_length( blake2b_param *P, const uint32_t leaf_length )
+{
+  P->leaf_length = leaf_length;
+  return 0;
+}
+
+static inline int blake2b_param_set_node_offset( blake2b_param *P, const uint64_t node_offset )
+{
+  P->node_offset = node_offset;
+  return 0;
+}
+
+static inline int blake2b_param_set_node_depth( blake2b_param *P, const uint8_t node_depth )
+{
+  P->node_depth = node_depth;
+  return 0;
+}
+
+static inline int blake2b_param_set_inner_length( blake2b_param *P, const uint8_t inner_length )
+{
+  P->inner_length = inner_length;
+  return 0;
+}
+
+static inline int blake2b_param_set_salt( blake2b_param *P, const uint8_t salt[BLAKE2B_SALTBYTES] )
+{
+  memcpy( P->salt, salt, BLAKE2B_SALTBYTES );
+  return 0;
+}
+
+static inline int blake2b_param_set_personal( blake2b_param *P, const uint8_t personal[BLAKE2B_PERSONALBYTES] )
+{
+  memcpy( P->personal, personal, BLAKE2B_PERSONALBYTES );
+  return 0;
+}
+
+static inline int blake2b_init0( blake2b_state *S )
+{
+  memset( S, 0, sizeof( blake2b_state ) );
+
+  for( int i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i];
+
+  return 0;
+}
+
+/* init xors IV with input parameter block */
+int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
+{
+  //blake2b_init0( S );
+  const uint8_t * v = ( const uint8_t * )( blake2b_IV );
+  const uint8_t * p = ( const uint8_t * )( P );
+  uint8_t * h = ( uint8_t * )( S->h );
+  /* IV XOR ParamBlock */
+  memset( S, 0, sizeof( blake2b_state ) );
+
+  for( int i = 0; i < BLAKE2B_OUTBYTES; ++i ) h[i] = v[i] ^ p[i];
+
+  return 0;
+}
+
+
+/* Some sort of default parameter block initialization, for sequential blake2b */
+int blake2b_init( blake2b_state *S, const uint8_t outlen )
+{
+  if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
+
+  const blake2b_param P =
+  {
+    outlen,
+    0,
+    1,
+    1,
+    0,
+    0,
+    0,
+    0,
+    {0},
+    {0},
+    {0}
+  };
+  return blake2b_init_param( S, &P );
+}
+
+int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen )
+{
+  if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
+
+  if ( ( !keylen ) || keylen > BLAKE2B_KEYBYTES ) return -1;
+
+  const blake2b_param P =
+  {
+    outlen,
+    keylen,
+    1,
+    1,
+    0,
+    0,
+    0,
+    0,
+    {0},
+    {0},
+    {0}
+  };
+
+  if( blake2b_init_param( S, &P ) < 0 )
+    return 0;
+
+  {
+    uint8_t block[BLAKE2B_BLOCKBYTES];
+    memset( block, 0, BLAKE2B_BLOCKBYTES );
+    memcpy( block, key, keylen );
+    blake2b_update( S, block, BLAKE2B_BLOCKBYTES );
+    secure_zero_memory( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from stack */
+  }
+  return 0;
+}
+
+static inline int blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] )
+{
+  __m128i row1l, row1h;
+  __m128i row2l, row2h;
+  __m128i row3l, row3h;
+  __m128i row4l, row4h;
+  __m128i b0, b1;
+  __m128i t0, t1;
+#if defined(HAVE_SSSE3) && !defined(HAVE_XOP)
+  const __m128i r16 = _mm_setr_epi8( 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9 );
+  const __m128i r24 = _mm_setr_epi8( 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10 );
+#endif
+#if defined(HAVE_SSE41)
+  const __m128i m0 = LOADU( block + 00 );
+  const __m128i m1 = LOADU( block + 16 );
+  const __m128i m2 = LOADU( block + 32 );
+  const __m128i m3 = LOADU( block + 48 );
+  const __m128i m4 = LOADU( block + 64 );
+  const __m128i m5 = LOADU( block + 80 );
+  const __m128i m6 = LOADU( block + 96 );
+  const __m128i m7 = LOADU( block + 112 );
+#else
+  const uint64_t  m0 = ( ( uint64_t * )block )[ 0];
+  const uint64_t  m1 = ( ( uint64_t * )block )[ 1];
+  const uint64_t  m2 = ( ( uint64_t * )block )[ 2];
+  const uint64_t  m3 = ( ( uint64_t * )block )[ 3];
+  const uint64_t  m4 = ( ( uint64_t * )block )[ 4];
+  const uint64_t  m5 = ( ( uint64_t * )block )[ 5];
+  const uint64_t  m6 = ( ( uint64_t * )block )[ 6];
+  const uint64_t  m7 = ( ( uint64_t * )block )[ 7];
+  const uint64_t  m8 = ( ( uint64_t * )block )[ 8];
+  const uint64_t  m9 = ( ( uint64_t * )block )[ 9];
+  const uint64_t m10 = ( ( uint64_t * )block )[10];
+  const uint64_t m11 = ( ( uint64_t * )block )[11];
+  const uint64_t m12 = ( ( uint64_t * )block )[12];
+  const uint64_t m13 = ( ( uint64_t * )block )[13];
+  const uint64_t m14 = ( ( uint64_t * )block )[14];
+  const uint64_t m15 = ( ( uint64_t * )block )[15];
+#endif
+  row1l = LOADU( &S->h[0] );
+  row1h = LOADU( &S->h[2] );
+  row2l = LOADU( &S->h[4] );
+  row2h = LOADU( &S->h[6] );
+  row3l = LOADU( &blake2b_IV[0] );
+  row3h = LOADU( &blake2b_IV[2] );
+  row4l = _mm_xor_si128( LOADU( &blake2b_IV[4] ), LOADU( &S->t[0] ) );
+  row4h = _mm_xor_si128( LOADU( &blake2b_IV[6] ), LOADU( &S->f[0] ) );
+  ROUND( 0 );
+  ROUND( 1 );
+  ROUND( 2 );
+  ROUND( 3 );
+  ROUND( 4 );
+  ROUND( 5 );
+  ROUND( 6 );
+  ROUND( 7 );
+  ROUND( 8 );
+  ROUND( 9 );
+  ROUND( 10 );
+  ROUND( 11 );
+  row1l = _mm_xor_si128( row3l, row1l );
+  row1h = _mm_xor_si128( row3h, row1h );
+  STOREU( &S->h[0], _mm_xor_si128( LOADU( &S->h[0] ), row1l ) );
+  STOREU( &S->h[2], _mm_xor_si128( LOADU( &S->h[2] ), row1h ) );
+  row2l = _mm_xor_si128( row4l, row2l );
+  row2h = _mm_xor_si128( row4h, row2h );
+  STOREU( &S->h[4], _mm_xor_si128( LOADU( &S->h[4] ), row2l ) );
+  STOREU( &S->h[6], _mm_xor_si128( LOADU( &S->h[6] ), row2h ) );
+  return 0;
+}
+
+
+int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen )
+{
+  while( inlen > 0 )
+  {
+    size_t left = S->buflen;
+    size_t fill = 2 * BLAKE2B_BLOCKBYTES - left;
+
+    if( inlen > fill )
+    {
+      memcpy( S->buf + left, in, fill ); // Fill buffer
+      S->buflen += fill;
+      blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
+      blake2b_compress( S, S->buf ); // Compress
+      memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); // Shift buffer left
+      S->buflen -= BLAKE2B_BLOCKBYTES;
+      in += fill;
+      inlen -= fill;
+    }
+    else // inlen <= fill
+    {
+      memcpy( S->buf + left, in, inlen );
+      S->buflen += inlen; // Be lazy, do not compress
+      in += inlen;
+      inlen -= inlen;
+    }
+  }
+
+  return 0;
+}
+
+
+int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen )
+{
+  if( outlen > BLAKE2B_OUTBYTES )
+    return -1;
+
+  if( S->buflen > BLAKE2B_BLOCKBYTES )
+  {
+    blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
+    blake2b_compress( S, S->buf );
+    S->buflen -= BLAKE2B_BLOCKBYTES;
+    memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
+  }
+
+  blake2b_increment_counter( S, S->buflen );
+  blake2b_set_lastblock( S );
+  memset( S->buf + S->buflen, 0, 2 * BLAKE2B_BLOCKBYTES - S->buflen ); /* Padding */
+  blake2b_compress( S, S->buf );
+  memcpy( out, &S->h[0], outlen );
+  return 0;
+}
+
+
+int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen )
+{
+  blake2b_state S[1];
+
+  /* Verify parameters */
+  if ( NULL == in ) return -1;
+
+  if ( NULL == out ) return -1;
+
+  if( NULL == key ) keylen = 0;
+
+  if( keylen )
+  {
+    if( blake2b_init_key( S, outlen, key, keylen ) < 0 ) return -1;
+  }
+  else
+  {
+    if( blake2b_init( S, outlen ) < 0 ) return -1;
+  }
+
+  blake2b_update( S, ( const uint8_t * )in, inlen );
+  blake2b_final( S, out, outlen );
+  return 0;
+}
+
+#if defined(SUPERCOP)
+int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
+{
+  return blake2b( out, in, NULL, BLAKE2B_OUTBYTES, inlen, 0 );
+}
+#endif
+
+#if defined(BLAKE2B_SELFTEST)
+#include <string.h>
+#include "blake2-kat.h"
+int main( int argc, char **argv )
+{
+  uint8_t key[BLAKE2B_KEYBYTES];
+  uint8_t buf[KAT_LENGTH];
+
+  for( size_t i = 0; i < BLAKE2B_KEYBYTES; ++i )
+    key[i] = ( uint8_t )i;
+
+  for( size_t i = 0; i < KAT_LENGTH; ++i )
+    buf[i] = ( uint8_t )i;
+
+  for( size_t i = 0; i < KAT_LENGTH; ++i )
+  {
+    uint8_t hash[BLAKE2B_OUTBYTES];
+    blake2b( hash, buf, key, BLAKE2B_OUTBYTES, i, BLAKE2B_KEYBYTES );
+
+    if( 0 != memcmp( hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES ) )
+    {
+      puts( "error" );
+      return -1;
+    }
+  }
+
+  puts( "ok" );
+  return 0;
+}
+#endif
+
+int blake2b_long(uint8_t *out, const void *in, const uint32_t outlen, const uint64_t inlen)
+{
+	blake2b_state blake_state;
+	if (outlen <= BLAKE2B_OUTBYTES)
+	{
+		blake2b_init(&blake_state, outlen);
+		blake2b_update(&blake_state, (const uint8_t*)&outlen, sizeof(uint32_t));
+		blake2b_update(&blake_state, (const uint8_t *)in, inlen);
+		blake2b_final(&blake_state, out, outlen);
+	}
+	else
+	{
+		uint8_t out_buffer[BLAKE2B_OUTBYTES];
+		uint8_t in_buffer[BLAKE2B_OUTBYTES];
+		blake2b_init(&blake_state, BLAKE2B_OUTBYTES);
+		blake2b_update(&blake_state, (const uint8_t*)&outlen, sizeof(uint32_t));
+		blake2b_update(&blake_state, (const uint8_t *)in, inlen);
+		blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
+		memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2);
+		out += BLAKE2B_OUTBYTES / 2;
+		uint32_t toproduce = outlen - BLAKE2B_OUTBYTES / 2;
+		while (toproduce > BLAKE2B_OUTBYTES)
+		{
+			memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES);
+			blake2b(out_buffer, in_buffer, NULL, BLAKE2B_OUTBYTES, BLAKE2B_OUTBYTES, 0);
+			memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2);
+			out += BLAKE2B_OUTBYTES / 2;
+			toproduce -= BLAKE2B_OUTBYTES / 2;
+		}
+		memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES);
+		blake2b(out_buffer, in_buffer, NULL, toproduce, BLAKE2B_OUTBYTES, 0);
+		memcpy(out, out_buffer, toproduce);
+
+	}
+	return 0;
+}
\ No newline at end of file
diff --git a/vendor/equihash/src/pow.cpp b/vendor/equihash/src/pow.cpp
new file mode 100644
index 0000000..019f0a5
--- /dev/null
+++ b/vendor/equihash/src/pow.cpp
@@ -0,0 +1,220 @@
+/*Code by Dmitry Khovratovich, 2016
+CC0 license
+
+Modifications by Steemit, Inc. 2016
+*/
+
+#include <equihash/pow.hpp>
+#include <equihash/blake2.h>
+#include <algorithm>
+
+
+static uint64_t rdtsc(void) {
+#ifdef _MSC_VER
+    return __rdtsc();
+#else
+#if defined(__amd64__) || defined(__x86_64__)
+    uint64_t rax, rdx;
+    __asm__ __volatile__("rdtsc" : "=a"(rax), "=d"(rdx) : : );
+    return (rdx << 32) | rax;
+#elif defined(__i386__) || defined(__i386) || defined(__X86__)
+    uint64_t rax;
+    __asm__ __volatile__("rdtsc" : "=A"(rax) : : );
+    return rax;
+#else
+#error "Not implemented!"
+#endif
+#endif
+}
+
+
+using namespace _POW;
+using namespace std;
+
+void Equihash::InitializeMemory()
+{
+    uint32_t  tuple_n = ((uint32_t)1) << (n / (k + 1));
+    Tuple default_tuple(k); // k blocks to store (one left for index)
+    std::vector<Tuple> def_tuples(LIST_LENGTH, default_tuple);
+    tupleList = std::vector<std::vector<Tuple>>(tuple_n, def_tuples);
+    filledList= std::vector<unsigned>(tuple_n, 0);
+    solutions.resize(0);
+    forks.resize(0);
+}
+
+void Equihash::FillMemory(uint32_t length) //works for k<=7
+{
+    uint32_t input[SEED_LENGTH + 2];
+    for (unsigned i = 0; i < SEED_LENGTH; ++i)
+        input[i] = seed[i];
+    input[SEED_LENGTH] = nonce;
+    input[SEED_LENGTH + 1] = 0;
+    uint32_t buf[MAX_N / 4];
+    for (unsigned i = 0; i < length; ++i, ++input[SEED_LENGTH + 1]) {
+        blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0);
+        uint32_t index = buf[0] >> (32 - n / (k + 1));
+        unsigned count = filledList[index];
+        if (count < LIST_LENGTH) {
+            for (unsigned j = 1; j < (k + 1); ++j) {
+                //select j-th block of n/(k+1) bits
+                tupleList[index][count].blocks[j - 1] = buf[j] >> (32 - n / (k + 1));
+            }
+            tupleList[index][count].reference = i;
+            filledList[index]++;
+        }
+    }
+}
+
+std::vector<Input> Equihash::ResolveTreeByLevel(Fork fork, unsigned level) {
+    if (level == 0)
+        return std::vector<Input>{fork.ref1, fork.ref2};
+    auto v1 = ResolveTreeByLevel(forks[level - 1][fork.ref1], level - 1);
+    auto v2 = ResolveTreeByLevel(forks[level - 1][fork.ref2], level - 1);
+    v1.insert(v1.end(), v2.begin(), v2.end());
+    return v1;
+}
+
+std::vector<Input> Equihash::ResolveTree(Fork fork) {
+    return ResolveTreeByLevel(fork, forks.size());
+}
+
+
+void Equihash::ResolveCollisions(bool store) {
+    const unsigned tableLength = tupleList.size();  //number of rows in the hashtable
+    const unsigned maxNewCollisions = tupleList.size()*FORK_MULTIPLIER;  //max number of collisions to be found
+    const unsigned newBlocks = tupleList[0][0].blocks.size() - 1;// number of blocks in the future collisions
+    std::vector<Fork> newForks(maxNewCollisions); //list of forks created at this step
+    auto tableRow = vector<Tuple>(LIST_LENGTH, Tuple(newBlocks)); //Row in the hash table
+    vector<vector<Tuple>> collisionList(tableLength,tableRow);
+    std::vector<unsigned> newFilledList(tableLength,0);  //number of entries in rows
+    uint32_t newColls = 0; //collision counter
+    for (unsigned i = 0; i < tableLength; ++i) {
+        for (unsigned j = 0; j < filledList[i]; ++j)        {
+            for (unsigned m = j + 1; m < filledList[i]; ++m) {   //Collision
+                //New index
+                uint32_t newIndex = tupleList[i][j].blocks[0] ^ tupleList[i][m].blocks[0];
+                Fork newFork = Fork(tupleList[i][j].reference, tupleList[i][m].reference);
+                //Check if we get a solution
+                if (store) {  //last step
+                    if (newIndex == 0) {//Solution
+                        std::vector<Input> solution_inputs = ResolveTree(newFork);
+                        solutions.push_back(Proof(n, k, seed, nonce, solution_inputs));
+                    }
+                }
+                else {         //Resolve
+                    if (newFilledList[newIndex] < LIST_LENGTH && newColls < maxNewCollisions) {
+                        for (unsigned l = 0; l < newBlocks; ++l) {
+                            collisionList[newIndex][newFilledList[newIndex]].blocks[l]
+                                = tupleList[i][j].blocks[l+1] ^ tupleList[i][m].blocks[l+1];
+                        }
+                        newForks[newColls] = newFork;
+                        collisionList[newIndex][newFilledList[newIndex]].reference = newColls;
+                        newFilledList[newIndex]++;
+                        newColls++;
+                    }//end of adding collision
+                }
+            }
+        }//end of collision for i
+    }
+    forks.push_back(newForks);
+    std::swap(tupleList, collisionList);
+    std::swap(filledList, newFilledList);
+}
+
+Proof Equihash::FindProof(){
+    this->nonce = 1;
+    while (nonce < MAX_NONCE) {
+        nonce++;
+        uint64_t start_cycles = rdtsc();
+        InitializeMemory(); //allocate
+        FillMemory(4UL << (n / (k + 1)-1));   //fill with hashes
+        uint64_t fill_end = rdtsc();
+        /*fp = fopen("proof.log", "a+");
+        fprintf(fp, "\n===MEMORY FILLED:\n");
+        PrintTuples(fp);
+        fclose(fp);*/
+        for (unsigned i = 1; i <= k; ++i) {
+            uint64_t resolve_start = rdtsc();
+            bool to_store = (i == k);
+            ResolveCollisions(to_store); //XOR collisions, concatenate indices and shift
+            uint64_t resolve_end = rdtsc();
+           /* fp = fopen("proof.log", "a+");
+            fprintf(fp, "\n===RESOLVED AFTER STEP %d:\n", i);
+            PrintTuples(fp);
+            fclose(fp);*/
+        }
+        uint64_t stop_cycles = rdtsc();
+
+        double  mcycles_d = (double)(stop_cycles - start_cycles) / (1UL << 20);
+        uint32_t kbytes = (tupleList.size()*LIST_LENGTH*k*sizeof(uint32_t)) / (1UL << 10);
+
+        //Duplicate check
+        for (unsigned i = 0; i < solutions.size(); ++i) {
+            auto vec = solutions[i].inputs;
+            std::sort(vec.begin(), vec.end());
+            bool dup = false;
+            for (unsigned k = 0; k < vec.size() - 1; ++k) {
+                if (vec[k] == vec[k + 1])
+                    dup = true;
+            }
+            if (!dup)
+                return solutions[i];
+        }
+    }
+    return Proof(n, k, seed, nonce, std::vector<uint32_t>());
+}
+
+/**
+ * Added by Steemit, Inc. for single iteration
+ */
+Proof Equihash::FindProof( Nonce _nonce )
+{
+    this->nonce = _nonce;
+    InitializeMemory(); //allocate
+    FillMemory(4UL << (n / (k + 1)-1));   //fill with hashes
+
+    for (unsigned i = 1; i <= k; ++i) {
+        bool to_store = (i == k);
+        ResolveCollisions(to_store); //XOR collisions, concatenate indices and shift
+    }
+
+    //Duplicate check
+    for (unsigned i = 0; i < solutions.size(); ++i) {
+       auto vec = solutions[i].inputs;
+       std::sort(vec.begin(), vec.end());
+       bool dup = false;
+       for (unsigned k = 0; k < vec.size() - 1; ++k) {
+             if (vec[k] == vec[k + 1])
+                dup = true;
+       }
+       if (!dup)
+          return solutions[i];
+    }
+
+    return Proof(n, k, seed, nonce, std::vector<uint32_t>());
+}
+
+bool Proof::Test()
+{
+    uint32_t input[SEED_LENGTH + 2];
+    for (unsigned i = 0; i < SEED_LENGTH; ++i)
+        input[i] = seed[i];
+    input[SEED_LENGTH] = nonce;
+    input[SEED_LENGTH + 1] = 0;
+    uint32_t buf[MAX_N / 4];
+    std::vector<uint32_t> blocks(k+1,0);
+    for (unsigned i = 0; i < inputs.size(); ++i) {
+        input[SEED_LENGTH + 1] = inputs[i];
+        blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0);
+        for (unsigned j = 0; j < (k + 1); ++j) {
+            //select j-th block of n/(k+1) bits
+            blocks[j] ^= buf[j] >> (32 - n / (k + 1));
+        }
+    }
+    bool b = inputs.size() != 0;
+    for (unsigned j = 0; j < (k + 1); ++j) {
+        b &= (blocks[j] == 0);
+    }
+
+    return b;
+}

From d7276e2d15c791674722741451a4ad51972428b8 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Tue, 22 Nov 2016 13:35:55 -0500
Subject: [PATCH 063/108] Add -std=c99 when compiling equihash, needed by gcc
 4.8

---
 vendor/equihash/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vendor/equihash/CMakeLists.txt b/vendor/equihash/CMakeLists.txt
index 5ab39e9..a90d302 100644
--- a/vendor/equihash/CMakeLists.txt
+++ b/vendor/equihash/CMakeLists.txt
@@ -1,5 +1,7 @@
 file(GLOB HEADERS "include/equihash/*.hpp" )
 
+set( CMAKE_C_FLAGS "-std=c99" )
+
 add_library( equihash
              src/pow.cpp
              src/blake2b.c

From 2f202e017c2fef0ad622d70b0c04951960037461 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Fri, 2 Dec 2016 16:15:35 -0500
Subject: [PATCH 064/108] Include is needed for some gcc build environments

---
 include/fc/interprocess/file_mutex.hpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/fc/interprocess/file_mutex.hpp b/include/fc/interprocess/file_mutex.hpp
index 0379074..6041824 100644
--- a/include/fc/interprocess/file_mutex.hpp
+++ b/include/fc/interprocess/file_mutex.hpp
@@ -2,7 +2,9 @@
 #include <fc/time.hpp>
 #include <fc/thread/spin_yield_lock.hpp>
 
-namespace fc { 
+#include <memory>
+
+namespace fc {
   class microseconds;
   class time_point;
   class path;
@@ -11,8 +13,8 @@ namespace fc {
   namespace detail { class file_mutex_impl; }
 
   /**
-   *  The purpose of this class is to support synchronization of 
-   *  processes, threads, and coop-threads.  
+   *  The purpose of this class is to support synchronization of
+   *  processes, threads, and coop-threads.
    *
    *  Before grabbing the lock for a thread or coop, a file_mutex will first
    *  grab a process-level lock.  After grabbing the process level lock, it will

From cfc53e8b82417f6c0db4ff67d257cbb49fbb64e4 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Wed, 7 Dec 2016 15:23:38 -0500
Subject: [PATCH 065/108] Wrap non-FC exceptions thrown by client methods

---
 src/rpc/http_api.cpp      | 10 +++++++---
 src/rpc/websocket_api.cpp | 16 ++++++++++------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/rpc/http_api.cpp b/src/rpc/http_api.cpp
index c9a7786..281febd 100644
--- a/src/rpc/http_api.cpp
+++ b/src/rpc/http_api.cpp
@@ -98,9 +98,13 @@ void http_api_connection::on_request( const fc::http::request& req, const fc::ht
          auto call = var.as<fc::rpc::request>();
          try
          {
-            auto result = _rpc_state.local_call( call.method, call.params );
-            resp_body = fc::json::to_string( fc::rpc::response( *call.id, result ) );
-            resp_status = http::reply::OK;
+            try
+            {
+               auto result = _rpc_state.local_call( call.method, call.params );
+               resp_body = fc::json::to_string( fc::rpc::response( *call.id, result ) );
+               resp_status = http::reply::OK;
+            }
+            FC_CAPTURE_AND_RETHROW( (call.method)(call.params) );
          }
          catch ( const fc::exception& e )
          {
diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index 60ef706..0ff9304 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -96,14 +96,18 @@ std::string websocket_api_connection::on_message(
          exception_ptr optexcept;
          try
          {
-            auto result = _rpc_state.local_call( call.method, call.params );
-            if( call.id )
+            try
             {
-               auto reply = fc::json::to_string( response( *call.id, result ) );
-               if( send_message )
-                  _connection.send_message( reply );
-               return reply;
+               auto result = _rpc_state.local_call( call.method, call.params );
+               if( call.id )
+               {
+                  auto reply = fc::json::to_string( response( *call.id, result ) );
+                  if( send_message )
+                     _connection.send_message( reply );
+                  return reply;
+               }
             }
+            FC_CAPTURE_AND_RETHROW( (call.method)(call.params) )
          }
          catch ( const fc::exception& e )
          {

From fe8710a7aa67d1eb7802c0c3254c64106e22f0ff Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Tue, 13 Dec 2016 15:27:44 -0500
Subject: [PATCH 066/108] Implement test_canonical_order and
 test_intermediate_zeros for equihash

---
 include/fc/crypto/equihash.hpp           |   3 +-
 src/crypto/equihash.cpp                  |  12 ++-
 vendor/equihash/include/equihash/pow.hpp |   3 +
 vendor/equihash/src/pow.cpp              | 129 ++++++++++++++++++++++-
 4 files changed, 142 insertions(+), 5 deletions(-)

diff --git a/include/fc/crypto/equihash.hpp b/include/fc/crypto/equihash.hpp
index cf0cb01..d37269e 100644
--- a/include/fc/crypto/equihash.hpp
+++ b/include/fc/crypto/equihash.hpp
@@ -11,7 +11,8 @@ namespace fc { namespace equihash {
       sha256   seed;
       std::vector< uint32_t > inputs;
 
-      bool is_valid() const;
+      bool is_valid( bool test_canonical_order = false, bool test_intermediate_zeros = false ) const;
+      void canonize_indexes();
 
       static proof hash( uint32_t n, uint32_t k, sha256 seed );
    };
diff --git a/src/crypto/equihash.cpp b/src/crypto/equihash.cpp
index ce855ab..d6f40bf 100644
--- a/src/crypto/equihash.cpp
+++ b/src/crypto/equihash.cpp
@@ -23,11 +23,21 @@ namespace fc { namespace equihash {
       return new_seed;
    }
 
-   bool proof::is_valid() const
+   bool proof::is_valid( bool test_canonical_order, bool test_intermediate_zeros ) const
    {
       _POW::Proof test( n, k, sha_to_seed( seed ), EQUIHASH_NONCE, inputs );
+      if( test_canonical_order && !test.CheckIndexesCanon() )
+         return false;
+      if( test_intermediate_zeros )
+         return test.FullTest();
       return test.Test();
+   }
 
+   void proof::canonize_indexes()
+   {
+      _POW::Proof p( n, k, sha_to_seed( seed ), EQUIHASH_NONCE, inputs );
+      _POW::Proof p_canon = p.CanonizeIndexes();
+      inputs = p_canon.inputs;
    }
 
    proof proof::hash( uint32_t n, uint32_t k, sha256 seed )
diff --git a/vendor/equihash/include/equihash/pow.hpp b/vendor/equihash/include/equihash/pow.hpp
index 8ac904e..297194d 100644
--- a/vendor/equihash/include/equihash/pow.hpp
+++ b/vendor/equihash/include/equihash/pow.hpp
@@ -64,6 +64,9 @@ namespace _POW{
         Proof():n(0),k(1),seed(0),nonce(0),inputs(std::vector<Input>()) {};
 
         bool Test();
+        bool FullTest()const;
+        bool CheckIndexesCanon()const;
+        Proof CanonizeIndexes()const;
 	};
 
     class Tuple {
diff --git a/vendor/equihash/src/pow.cpp b/vendor/equihash/src/pow.cpp
index 019f0a5..d724b33 100644
--- a/vendor/equihash/src/pow.cpp
+++ b/vendor/equihash/src/pow.cpp
@@ -8,7 +8,6 @@ Modifications by Steemit, Inc. 2016
 #include <equihash/blake2.h>
 #include <algorithm>
 
-
 static uint64_t rdtsc(void) {
 #ifdef _MSC_VER
     return __rdtsc();
@@ -158,7 +157,9 @@ Proof Equihash::FindProof(){
                     dup = true;
             }
             if (!dup)
-                return solutions[i];
+            {
+                return solutions[i].CanonizeIndexes();
+            }
         }
     }
     return Proof(n, k, seed, nonce, std::vector<uint32_t>());
@@ -188,12 +189,51 @@ Proof Equihash::FindProof( Nonce _nonce )
                 dup = true;
        }
        if (!dup)
-          return solutions[i];
+       {
+          return solutions[i].CanonizeIndexes();
+       }
     }
 
     return Proof(n, k, seed, nonce, std::vector<uint32_t>());
 }
 
+Proof Proof::CanonizeIndexes()const
+{
+   std::vector< uint32_t > new_inputs = inputs;
+
+   size_t step = 1;
+   while( step < new_inputs.size() )
+   {
+      for( size_t i=0; i<new_inputs.size(); i+=step+step )
+      {
+         auto ita = new_inputs.begin()+i, itb = ita+step;
+         if( (*ita) >= (*itb) )
+         {
+            std::swap_ranges( ita, itb, itb );
+         }
+      }
+      step += step;
+   }
+   return Proof(n, k, seed, nonce, new_inputs);
+}
+
+bool Proof::CheckIndexesCanon()const
+{
+   bool was_ok = true;
+   size_t step = 1;
+   while( step < inputs.size() )
+   {
+      for( size_t i=0; i<inputs.size(); i+=step+step )
+      {
+         auto ita = inputs.begin()+i, itb = ita+step;
+         if( (*ita) >= (*itb) )
+            return false;
+      }
+      step += step;
+   }
+   return was_ok;
+}
+
 bool Proof::Test()
 {
     uint32_t input[SEED_LENGTH + 2];
@@ -218,3 +258,86 @@ bool Proof::Test()
 
     return b;
 }
+
+bool Proof::FullTest()const
+{
+   // Length must be 2**k
+   if( inputs.size() != size_t(1 << k) )
+      return false;
+
+   // Ensure all values are distinct
+   std::vector<Input> sorted_inputs = inputs;
+   std::sort( sorted_inputs.begin(), sorted_inputs.end() );
+   for( size_t i=1; i<inputs.size(); i++ )
+   {
+      if( sorted_inputs[i-1] >= sorted_inputs[i] )
+         return false;
+   }
+
+   // Ensure all values are canonically indexed
+   /*
+   if( !CheckIndexesCanon() )
+      return false;
+   */
+
+   // Initialize blocks array
+   uint32_t input[SEED_LENGTH + 2];
+   for( size_t i=0; i<SEED_LENGTH; i++ )
+      input[i] = seed[i];
+   input[SEED_LENGTH] = nonce;
+   input[SEED_LENGTH + 1] = 0;
+   uint32_t buf[MAX_N / 4];
+
+   std::vector< std::vector< uint32_t > > blocks;
+
+   const uint32_t max_input = uint32_t(1) << (n / (k + 1) + 1);
+
+   for( size_t i=0; i<inputs.size(); i++ )
+   {
+      input[SEED_LENGTH + 1] = inputs[i];
+      if( inputs[i] >= max_input )
+         return false;
+
+      blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0);
+      blocks.emplace_back();
+      std::vector<uint32_t>& x = blocks.back();
+      x.resize(k+1);
+      for( size_t j=0; j<(k+1); j++ )
+      {
+         //select j-th block of n/(k+1) bits
+         x[j] = buf[j] >> (32 - n / (k + 1));
+      }
+   }
+
+   while( true )
+   {
+      /*
+      std::cout << "\n\nBegin loop iteration\n";
+      for( const std::vector< uint32_t >& x : blocks )
+      {
+         for( const uint32_t& e : x )
+            std::cout << std::hex << std::setw(5) << e << " ";
+         std::cout << std::endl;
+      }
+      */
+
+      size_t count = blocks.size();
+      if( count == 0 )
+         return false;
+      if( count == 1 )
+      {
+         return (blocks[0].size() == 1) && (blocks[0][0] == 0);
+      }
+      if( (count&1) != 0 )
+         return false;
+      for( size_t i=0,new_i=0; i<count; i+=2,new_i++ )
+      {
+         if( blocks[i][0] != blocks[i+1][0] )
+            return false;
+         for( size_t j=1; j<blocks[i].size(); j++ )
+            blocks[new_i][j-1] = blocks[i][j] ^ blocks[i+1][j];
+         blocks[new_i].resize(blocks[new_i].size()-1);
+      }
+      blocks.resize(blocks.size() >> 1);
+   }
+}

From ad3efeb28a93bdfeb8886be79d70985f036bec74 Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Wed, 14 Dec 2016 13:00:57 -0500
Subject: [PATCH 067/108] Add comments and minor refactoring of canonization
 methods for clarity

Also guard against out-of-bounds access for untrusted input
---
 vendor/equihash/src/pow.cpp | 58 +++++++++++++++++++++++++++++--------
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/vendor/equihash/src/pow.cpp b/vendor/equihash/src/pow.cpp
index d724b33..3ad7f50 100644
--- a/vendor/equihash/src/pow.cpp
+++ b/vendor/equihash/src/pow.cpp
@@ -199,39 +199,73 @@ Proof Equihash::FindProof( Nonce _nonce )
 
 Proof Proof::CanonizeIndexes()const
 {
+   // We consider the index values in the inputs array to be the leaf nodes of a binary
+   // tree, and the inner nodes to be labelled with the XOR of the corresponding vector
+   // elements.
+   //
+   // Define a binary tree to be canonically sorted if, for each inner node, the least
+   // leaf descendant of the left child is less than the least leaf descendant of the
+   // right child.
+   //
+   // This method puts the inputs into canonical order without altering the inner node
+   // labels.  Thus canonization preserves the validity of the proof and the
+   // footprint of Wagner's algorithm.
+   //
+   // We use a bottom-up traversal, dividing the input into successively larger power-of-2
+   // blocks and swapping the two half-blocks if non-canonical.
+   //
+   // Say a block is least-first if the least element is the first element.
+   //
+   // If each half-block is least-first, the conditional swap ensures the full block will also
+   // be least-first. The half-blocks in the initial iteration are obviously least-first
+   // (they only have a single element!).  So by induction, at each later iteration the half-blocks
+   // of that iteration are least-first (since they were the full blocks of the previous iteration,
+   // which were made least-first by the previous iteration's conditional swap).
+   //
+   // As a consequence, no search is necessary to find the least element in each half-block,
+   // it is always the first element in the half-block.
+
    std::vector< uint32_t > new_inputs = inputs;
 
-   size_t step = 1;
-   while( step < new_inputs.size() )
+   size_t input_size = inputs.size();
+   size_t half_size = 1;
+   size_t block_size = 2;
+   while( block_size <= input_size )
    {
-      for( size_t i=0; i<new_inputs.size(); i+=step+step )
+      for( size_t i=0; i+block_size<=input_size; i+=block_size )
       {
-         auto ita = new_inputs.begin()+i, itb = ita+step;
+         auto ita = new_inputs.begin()+i, itb = ita+half_size;
          if( (*ita) >= (*itb) )
          {
             std::swap_ranges( ita, itb, itb );
          }
       }
-      step += step;
+      half_size = block_size;
+      block_size += block_size;
    }
    return Proof(n, k, seed, nonce, new_inputs);
 }
 
 bool Proof::CheckIndexesCanon()const
 {
-   bool was_ok = true;
-   size_t step = 1;
-   while( step < inputs.size() )
+   // This method is logically identical to CanonizeIndexes() but will return false
+   // instead of swapping elements.
+
+   size_t input_size = inputs.size();
+   size_t half_size = 1;
+   size_t block_size = 2;
+   while( block_size <= input_size )
    {
-      for( size_t i=0; i<inputs.size(); i+=step+step )
+      for( size_t i=0; i+block_size<=input_size; i+=block_size )
       {
-         auto ita = inputs.begin()+i, itb = ita+step;
+         auto ita = inputs.begin()+i, itb = ita+half_size;
          if( (*ita) >= (*itb) )
             return false;
       }
-      step += step;
+      half_size = block_size;
+      block_size += block_size;
    }
-   return was_ok;
+   return true;
 }
 
 bool Proof::Test()

From beca6a8264685720a34ebf88b15d78da80c3b12b Mon Sep 17 00:00:00 2001
From: theoreticalbts <theoreticalbts@users.noreply.github.com>
Date: Wed, 14 Dec 2016 13:09:01 -0500
Subject: [PATCH 068/108] Add debug logging

---
 vendor/equihash/src/pow.cpp | 50 ++++++++++++++++++++++++++++++++-----
 1 file changed, 44 insertions(+), 6 deletions(-)

diff --git a/vendor/equihash/src/pow.cpp b/vendor/equihash/src/pow.cpp
index 3ad7f50..95d6bfb 100644
--- a/vendor/equihash/src/pow.cpp
+++ b/vendor/equihash/src/pow.cpp
@@ -8,6 +8,16 @@ Modifications by Steemit, Inc. 2016
 #include <equihash/blake2.h>
 #include <algorithm>
 
+#ifdef EQUIHASH_POW_VERBOSE
+#include <iomanip>
+#include <iostream>
+
+#define EQUIHASH_LOG(s) \
+   std::cerr << s << std::endl;
+#else
+#define EQUIHASH_LOG(s)
+#endif
+
 static uint64_t rdtsc(void) {
 #ifdef _MSC_VER
     return __rdtsc();
@@ -297,7 +307,10 @@ bool Proof::FullTest()const
 {
    // Length must be 2**k
    if( inputs.size() != size_t(1 << k) )
+   {
+      EQUIHASH_LOG( "PoW failed length test" );
       return false;
+   }
 
    // Ensure all values are distinct
    std::vector<Input> sorted_inputs = inputs;
@@ -305,7 +318,10 @@ bool Proof::FullTest()const
    for( size_t i=1; i<inputs.size(); i++ )
    {
       if( sorted_inputs[i-1] >= sorted_inputs[i] )
+      {
+         EQUIHASH_LOG( "PoW failed distinct test" );
          return false;
+      }
    }
 
    // Ensure all values are canonically indexed
@@ -330,7 +346,10 @@ bool Proof::FullTest()const
    {
       input[SEED_LENGTH + 1] = inputs[i];
       if( inputs[i] >= max_input )
+      {
+         EQUIHASH_LOG( "PoW failed max_input test" );
          return false;
+      }
 
       blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0);
       blocks.emplace_back();
@@ -345,29 +364,48 @@ bool Proof::FullTest()const
 
    while( true )
    {
-      /*
-      std::cout << "\n\nBegin loop iteration\n";
+#ifdef EQUIHASH_POW_VERBOSE
+      std::cerr << "\n\nBegin loop iteration\n";
       for( const std::vector< uint32_t >& x : blocks )
       {
          for( const uint32_t& e : x )
-            std::cout << std::hex << std::setw(5) << e << " ";
-         std::cout << std::endl;
+            std::cerr << std::hex << std::setw(5) << e << " ";
+         std::cerr << std::endl;
       }
-      */
+#endif
 
       size_t count = blocks.size();
       if( count == 0 )
+      {
+         EQUIHASH_LOG( "PoW failed with count == 0" );
          return false;
+      }
       if( count == 1 )
       {
-         return (blocks[0].size() == 1) && (blocks[0][0] == 0);
+         if( blocks[0].size() != 1 )
+         {
+            EQUIHASH_LOG( "PoW failed due to vector size" );
+            return false;
+         }
+         if( blocks[0][0] != 0 )
+         {
+            EQUIHASH_LOG( "PoW failed because final bits are not zero" );
+            return false;
+         }
+         return true;
       }
       if( (count&1) != 0 )
+      {
+         EQUIHASH_LOG( "PoW failed with odd count" );
          return false;
+      }
       for( size_t i=0,new_i=0; i<count; i+=2,new_i++ )
       {
          if( blocks[i][0] != blocks[i+1][0] )
+         {
+            EQUIHASH_LOG( "PoW failed because leading element of vector pair does not match" );
             return false;
+         }
          for( size_t j=1; j<blocks[i].size(); j++ )
             blocks[new_i][j-1] = blocks[i][j] ^ blocks[i+1][j];
          blocks[new_i].resize(blocks[new_i].size()-1);

From b07f42955666cc44571d9f527a4e540a5431fabf Mon Sep 17 00:00:00 2001
From: Daniel Larimer <dan@steemit.com>
Date: Tue, 3 Jan 2017 15:13:22 -0500
Subject: [PATCH 069/108] remove udt and make websocketpp includes public

---
 CMakeLists.txt                    |    9 +-
 include/fc/network/udt_socket.hpp |   70 -
 src/network/udt_socket.cpp        |  405 -----
 tests/CMakeLists.txt              |    7 -
 vendor/udt4/CMakeLists.txt        |   26 -
 vendor/udt4/LICENSE.txt           |   32 -
 vendor/udt4/README.txt            |   43 -
 vendor/udt4/src/api.cpp           | 2392 --------------------------
 vendor/udt4/src/api.h             |  268 ---
 vendor/udt4/src/buffer.cpp        |  652 -------
 vendor/udt4/src/buffer.h          |  275 ---
 vendor/udt4/src/cache.cpp         |  123 --
 vendor/udt4/src/cache.h           |  293 ----
 vendor/udt4/src/ccc.cpp           |  314 ----
 vendor/udt4/src/ccc.h             |  278 ---
 vendor/udt4/src/channel.cpp       |  340 ----
 vendor/udt4/src/channel.h         |  171 --
 vendor/udt4/src/common.cpp        |  765 ---------
 vendor/udt4/src/common.h          |  321 ----
 vendor/udt4/src/core.cpp          | 2675 -----------------------------
 vendor/udt4/src/core.h            |  458 -----
 vendor/udt4/src/epoll.cpp         |  367 ----
 vendor/udt4/src/epoll.h           |  173 --
 vendor/udt4/src/list.cpp          |  703 --------
 vendor/udt4/src/list.h            |  202 ---
 vendor/udt4/src/md5.cpp           |  381 ----
 vendor/udt4/src/md5.h             |   91 -
 vendor/udt4/src/packet.cpp        |  411 -----
 vendor/udt4/src/packet.h          |  223 ---
 vendor/udt4/src/queue.cpp         | 1253 --------------
 vendor/udt4/src/queue.h           |  527 ------
 vendor/udt4/src/udt.h             |  359 ----
 vendor/udt4/src/window.cpp        |  286 ---
 vendor/udt4/src/window.h          |  187 --
 34 files changed, 3 insertions(+), 15077 deletions(-)
 delete mode 100644 include/fc/network/udt_socket.hpp
 delete mode 100644 src/network/udt_socket.cpp
 delete mode 100644 vendor/udt4/CMakeLists.txt
 delete mode 100644 vendor/udt4/LICENSE.txt
 delete mode 100644 vendor/udt4/README.txt
 delete mode 100644 vendor/udt4/src/api.cpp
 delete mode 100644 vendor/udt4/src/api.h
 delete mode 100644 vendor/udt4/src/buffer.cpp
 delete mode 100644 vendor/udt4/src/buffer.h
 delete mode 100644 vendor/udt4/src/cache.cpp
 delete mode 100644 vendor/udt4/src/cache.h
 delete mode 100644 vendor/udt4/src/ccc.cpp
 delete mode 100644 vendor/udt4/src/ccc.h
 delete mode 100644 vendor/udt4/src/channel.cpp
 delete mode 100644 vendor/udt4/src/channel.h
 delete mode 100644 vendor/udt4/src/common.cpp
 delete mode 100644 vendor/udt4/src/common.h
 delete mode 100644 vendor/udt4/src/core.cpp
 delete mode 100644 vendor/udt4/src/core.h
 delete mode 100644 vendor/udt4/src/epoll.cpp
 delete mode 100644 vendor/udt4/src/epoll.h
 delete mode 100644 vendor/udt4/src/list.cpp
 delete mode 100644 vendor/udt4/src/list.h
 delete mode 100644 vendor/udt4/src/md5.cpp
 delete mode 100644 vendor/udt4/src/md5.h
 delete mode 100644 vendor/udt4/src/packet.cpp
 delete mode 100644 vendor/udt4/src/packet.h
 delete mode 100644 vendor/udt4/src/queue.cpp
 delete mode 100644 vendor/udt4/src/queue.h
 delete mode 100644 vendor/udt4/src/udt.h
 delete mode 100644 vendor/udt4/src/window.cpp
 delete mode 100644 vendor/udt4/src/window.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ad88c8..b6d7774 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -226,7 +226,6 @@ set( fc_sources
      src/crypto/rand.cpp
      src/network/tcp_socket.cpp
      src/network/udp_socket.cpp
-     src/network/udt_socket.cpp
      src/network/http/http_connection.cpp
      src/network/http/http_server.cpp
      src/network/http/websocket.cpp
@@ -253,7 +252,6 @@ list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp")
 list(APPEND sources ${fc_headers})
 
 add_subdirectory( vendor/websocketpp )
-add_subdirectory( vendor/udt4 )
 add_subdirectory( vendor/equihash )
 
 setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY )
@@ -348,22 +346,21 @@ target_include_directories(fc
     ${Boost_INCLUDE_DIR}
     ${OPENSSL_INCLUDE_DIR}
     "vendor/diff-match-patch-cpp-stl"
+    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
     "${readline_includes}"
 
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/cyoencode-1.0.2/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/udt4/src
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/equihash
   )
 
-#target_link_libraries( fc PUBLIC udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
+#target_link_libraries( fc PUBLIC ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} udt equihash ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} equihash ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
 
 if(MSVC)
   set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
diff --git a/include/fc/network/udt_socket.hpp b/include/fc/network/udt_socket.hpp
deleted file mode 100644
index 1210427..0000000
--- a/include/fc/network/udt_socket.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-#include <fc/utility.hpp>
-#include <fc/fwd.hpp>
-#include <fc/io/iostream.hpp>
-#include <fc/time.hpp>
-#include <fc/noncopyable.hpp>
-
-namespace fc {
-   namespace ip { class endpoint; }
-
-   class udt_socket : public virtual iostream, public noncopyable
-   {
-     public:
-       udt_socket();
-       ~udt_socket();
-
-       void bind( const fc::ip::endpoint& local_endpoint );
-       void connect_to( const fc::ip::endpoint& remote_endpoint );
-
-       fc::ip::endpoint remote_endpoint() const;
-       fc::ip::endpoint local_endpoint() const;
-
-       using istream::get;
-       void get( char& c )
-       {
-           read( &c, 1 );
-       }
-
-
-       /// istream interface
-       /// @{
-       virtual size_t   readsome( char* buffer, size_t max );
-       virtual size_t   readsome( const std::shared_ptr<char>& buf, size_t len, size_t offset );
-       virtual bool     eof()const;
-       /// @}
-
-       /// ostream interface
-       /// @{
-       virtual size_t   writesome( const char* buffer, size_t len );
-       virtual size_t   writesome( const std::shared_ptr<const char>& buf, size_t len, size_t offset );
-       virtual void     flush();
-       virtual void     close();
-       /// @}
-
-       void open();
-       bool is_open()const;
-
-     private:
-       friend class udt_server;
-       int  _udt_socket_id;
-   };
-   typedef std::shared_ptr<udt_socket> udt_socket_ptr;
-
-   class udt_server : public noncopyable
-   {
-      public:
-        udt_server();
-        ~udt_server();
-
-        void             close();
-        void             accept( udt_socket& s );
-
-        void             listen( const fc::ip::endpoint& ep );
-        fc::ip::endpoint local_endpoint() const;
-
-      private:
-        int _udt_socket_id;
-   };
-
-} // fc
diff --git a/src/network/udt_socket.cpp b/src/network/udt_socket.cpp
deleted file mode 100644
index 655e16c..0000000
--- a/src/network/udt_socket.cpp
+++ /dev/null
@@ -1,405 +0,0 @@
-#include <fc/network/udt_socket.hpp>
-#include <fc/thread/thread.hpp>
-#include <fc/thread/mutex.hpp>
-#include <fc/thread/unique_lock.hpp>
-#include <fc/network/ip.hpp>
-#include <udt.h>
-
-#ifndef WIN32
-# include <arpa/inet.h>
-#endif
-
-namespace fc {
-
-   void check_udt_errors()
-   {
-      UDT::ERRORINFO& error_info = UDT::getlasterror();
-      if( error_info.getErrorCode() )
-      {
-         std::string  error_message = error_info.getErrorMessage();
-         error_info.clear();
-         FC_CAPTURE_AND_THROW( udt_exception, (error_message) );
-      }
-   }
-   
-   class udt_epoll_service 
-   {
-      public:
-         udt_epoll_service()
-         :_epoll_thread("udt_epoll")
-         {
-            UDT::startup();
-            check_udt_errors();
-            _epoll_id = UDT::epoll_create();
-            _epoll_loop = _epoll_thread.async( [=](){ poll_loop(); }, "udt_poll_loop" );
-         }
-
-         ~udt_epoll_service()
-         {
-            _epoll_loop.cancel("udt_epoll_service is destructing");
-            _epoll_loop.wait();
-            UDT::cleanup();
-         }
-
-         void poll_loop()
-         {
-            std::set<UDTSOCKET> read_ready;
-            std::set<UDTSOCKET> write_ready;
-            while( !_epoll_loop.canceled() )
-            {
-               UDT::epoll_wait( _epoll_id, 
-                                &read_ready, 
-                                &write_ready, 100000000 );
-
-               { synchronized(_read_promises_mutex)
-                  for( auto sock : read_ready )
-                  {
-                     auto itr = _read_promises.find( sock );
-                     if( itr != _read_promises.end() )
-                     {
-                        itr->second->set_value();
-                        _read_promises.erase(itr);
-                     }
-                  }
-               } // synchronized read promise mutex
-
-               { synchronized(_write_promises_mutex)
-                  for( auto sock : write_ready )
-                  {
-                     auto itr = _write_promises.find( sock );
-                     if( itr != _write_promises.end() )
-                     {
-                        itr->second->set_value();
-                        _write_promises.erase(itr);
-                     }
-                  }
-               } // synchronized write promise mutex
-            } // while not canceled
-         } // poll_loop
-
-
-         void notify_read( int udt_socket_id, 
-                           const promise<void>::ptr& p )
-         {
-            int events = UDT_EPOLL_IN | UDT_EPOLL_ERR;
-            if( 0 != UDT::epoll_add_usock( _epoll_id, 
-                                           udt_socket_id, 
-                                           &events ) )
-            {
-               check_udt_errors();
-            }
-            { synchronized(_read_promises_mutex)
-
-               _read_promises[udt_socket_id] = p;
-            }
-         }
-
-         void notify_write( int udt_socket_id,
-                            const promise<void>::ptr& p )
-         {
-            int events = UDT_EPOLL_OUT | UDT_EPOLL_ERR;
-            if( 0 != UDT::epoll_add_usock( _epoll_id, 
-                                  udt_socket_id, 
-                                  &events ) )
-            {
-              check_udt_errors();
-            }
-
-            { synchronized(_write_promises_mutex)
-               _write_promises[udt_socket_id] = p;
-            }
-         }
-         void remove( int udt_socket_id )
-         {
-             { synchronized(_read_promises_mutex)
-                auto read_itr = _read_promises.find( udt_socket_id );
-                if( read_itr != _read_promises.end() )
-                {
-                   read_itr->second->set_exception( fc::copy_exception( fc::exception() ) );
-                   _read_promises.erase(read_itr);
-                }
-             }
-             { synchronized(_write_promises_mutex)
-                auto write_itr = _write_promises.find( udt_socket_id );
-                if( write_itr != _write_promises.end() )
-                {
-                   write_itr->second->set_exception( fc::copy_exception( fc::exception() ) );
-                   _write_promises.erase(write_itr);
-                }
-             }
-             UDT::epoll_remove_usock( _epoll_id, udt_socket_id );
-         }
-
-      private:
-         fc::mutex                                    _read_promises_mutex;
-         fc::mutex                                    _write_promises_mutex;
-         std::unordered_map<int, promise<void>::ptr > _read_promises;
-         std::unordered_map<int, promise<void>::ptr > _write_promises;
-
-         fc::future<void> _epoll_loop;
-         fc::thread _epoll_thread;
-         int        _epoll_id;
-   };
-
-
-   udt_epoll_service& default_epool_service()
-   {
-      static udt_epoll_service* default_service = new udt_epoll_service();
-      return *default_service;
-   }
-
-
-
-   udt_socket::udt_socket()
-   :_udt_socket_id( UDT::INVALID_SOCK )
-   {
-   }
-
-   udt_socket::~udt_socket()
-   {
-     try {
-        close();
-     } catch ( const fc::exception& e )
-     {
-        wlog( "${e}", ("e", e.to_detail_string() ) );
-     }
-   }
-
-   void udt_socket::bind( const fc::ip::endpoint& local_endpoint )
-   { try {
-      if( !is_open() ) 
-         open();
-
-      sockaddr_in local_addr;
-      local_addr.sin_family = AF_INET;
-      local_addr.sin_port = htons(local_endpoint.port());
-      local_addr.sin_addr.s_addr = htonl(local_endpoint.get_address());
-
-      if( UDT::ERROR == UDT::bind(_udt_socket_id, (sockaddr*)&local_addr, sizeof(local_addr)) )
-         check_udt_errors();
-   } FC_CAPTURE_AND_RETHROW() }
-
-   void udt_socket::connect_to( const ip::endpoint& remote_endpoint )
-   { try {
-      if( !is_open() ) 
-         open();
-
-      sockaddr_in serv_addr;
-      serv_addr.sin_family = AF_INET;
-      serv_addr.sin_port = htons(remote_endpoint.port());
-      serv_addr.sin_addr.s_addr = htonl(remote_endpoint.get_address());
-
-      // UDT doesn't allow now blocking connects... 
-      fc::thread connect_thread("connect_thread");
-      connect_thread.async( [&](){
-         if( UDT::ERROR == UDT::connect(_udt_socket_id, (sockaddr*)&serv_addr, sizeof(serv_addr)) )
-            check_udt_errors();
-      }, "udt_socket::connect_to").wait();
-
-      bool block = false;
-      UDT::setsockopt(_udt_socket_id, 0, UDT_SNDSYN, &block, sizeof(bool));
-      UDT::setsockopt(_udt_socket_id, 0, UDT_RCVSYN, &block, sizeof(bool));
-      check_udt_errors();
-
-   } FC_CAPTURE_AND_RETHROW( (remote_endpoint) ) }
-
-   ip::endpoint udt_socket::remote_endpoint() const
-   { try {
-      sockaddr_in peer_addr;
-      int peer_addr_size = sizeof(peer_addr);
-      int error_code = UDT::getpeername( _udt_socket_id, (struct sockaddr*)&peer_addr, &peer_addr_size );
-      if( error_code == UDT::ERROR )
-          check_udt_errors();
-      return ip::endpoint( ip::address( htonl( peer_addr.sin_addr.s_addr ) ), htons(peer_addr.sin_port) );
-   } FC_CAPTURE_AND_RETHROW() }
-
-   ip::endpoint udt_socket::local_endpoint() const
-   { try {
-      sockaddr_in sock_addr;
-      int addr_size = sizeof(sock_addr);
-      int error_code = UDT::getsockname( _udt_socket_id, (struct sockaddr*)&sock_addr, &addr_size );
-      if( error_code == UDT::ERROR )
-          check_udt_errors();
-      return ip::endpoint( ip::address( htonl( sock_addr.sin_addr.s_addr ) ), htons(sock_addr.sin_port) );
-   } FC_CAPTURE_AND_RETHROW() }
-
-
-   /// @{
-   size_t   udt_socket::readsome( char* buffer, size_t max )
-   { try {
-      auto bytes_read = UDT::recv( _udt_socket_id, buffer, max, 0 );
-      while( bytes_read == UDT::ERROR )
-      {
-         if( UDT::getlasterror().getErrorCode() == CUDTException::EASYNCRCV )
-         {
-            UDT::getlasterror().clear();
-            promise<void>::ptr p(new promise<void>("udt_socket::readsome"));
-            default_epool_service().notify_read( _udt_socket_id, p );
-            p->wait();
-            bytes_read = UDT::recv( _udt_socket_id, buffer, max, 0 );
-         }
-         else
-            check_udt_errors();
-      }
-      return bytes_read;
-   } FC_CAPTURE_AND_RETHROW( (max) ) }
-
-   size_t udt_socket::readsome( const std::shared_ptr<char>& buf, size_t len, size_t offset )
-   {
-     return readsome(buf.get() + offset, len);
-   }
-
-   bool     udt_socket::eof()const
-   {
-      // TODO... 
-      return false;
-   }
-   /// @}
-   
-   /// ostream interface
-   /// @{
-   size_t   udt_socket::writesome( const char* buffer, size_t len )
-   { try {
-      auto bytes_sent = UDT::send(_udt_socket_id, buffer, len, 0);
-
-      while( UDT::ERROR == bytes_sent )
-      {
-         if( UDT::getlasterror().getErrorCode() == CUDTException::EASYNCSND )
-         {
-            UDT::getlasterror().clear();
-            promise<void>::ptr p(new promise<void>("udt_socket::writesome"));
-            default_epool_service().notify_write( _udt_socket_id, p );
-            p->wait();
-            bytes_sent = UDT::send(_udt_socket_id, buffer, len, 0);
-            continue;
-         }
-         else
-            check_udt_errors();
-      }
-      return bytes_sent;
-   } FC_CAPTURE_AND_RETHROW( (len) ) }
-
-   size_t udt_socket::writesome( const std::shared_ptr<const char>& buf, size_t len, size_t offset )
-   {
-     return writesome(buf.get() + offset, len);
-   }
-
-   void     udt_socket::flush(){}
-
-   void     udt_socket::close()
-   { try {
-      if( is_open() )
-      {
-         default_epool_service().remove( _udt_socket_id );
-         UDT::close( _udt_socket_id );
-         check_udt_errors();
-         _udt_socket_id = UDT::INVALID_SOCK;
-      }
-      else
-      {
-         wlog( "already closed" );
-      }
-   } FC_CAPTURE_AND_RETHROW() }
-   /// @}
-   
-   void udt_socket::open()
-   {
-      _udt_socket_id = UDT::socket(AF_INET, SOCK_STREAM, 0);
-      if( _udt_socket_id == UDT::INVALID_SOCK )
-         check_udt_errors();
-   }
-
-   bool udt_socket::is_open()const
-   {
-      return _udt_socket_id != UDT::INVALID_SOCK;
-   }
-     
-
-
-
-
-
-  udt_server::udt_server()
-  :_udt_socket_id( UDT::INVALID_SOCK )
-  {
-      _udt_socket_id = UDT::socket(AF_INET, SOCK_STREAM, 0);
-      if( _udt_socket_id == UDT::INVALID_SOCK )
-         check_udt_errors();
-
-      bool block = false;
-      UDT::setsockopt(_udt_socket_id, 0, UDT_SNDSYN, &block, sizeof(bool));
-      check_udt_errors();
-      UDT::setsockopt(_udt_socket_id, 0, UDT_RCVSYN, &block, sizeof(bool));
-      check_udt_errors();
-  }
-
-  udt_server::~udt_server()
-  {
-     try {
-        close();
-     } catch ( const fc::exception& e )
-     {
-        wlog( "${e}", ("e", e.to_detail_string() ) );
-     }
-  }
-
-  void udt_server::close()
-  { try {
-     if( _udt_socket_id != UDT::INVALID_SOCK )
-     {
-        UDT::close( _udt_socket_id );
-        check_udt_errors();
-        default_epool_service().remove( _udt_socket_id );
-        _udt_socket_id = UDT::INVALID_SOCK;
-     }
-  } FC_CAPTURE_AND_RETHROW() }
-
-  void udt_server::accept( udt_socket& s )
-  { try {
-      FC_ASSERT( !s.is_open() );
-      int namelen;
-      sockaddr_in their_addr;
-
-
-      while( s._udt_socket_id == UDT::INVALID_SOCK )
-      {
-         s._udt_socket_id = UDT::accept( _udt_socket_id, (sockaddr*)&their_addr, &namelen );
-         if( UDT::getlasterror().getErrorCode() == CUDTException::EASYNCRCV )
-         {
-            UDT::getlasterror().clear();
-            promise<void>::ptr p(new promise<void>("udt_server::accept"));
-            default_epool_service().notify_read( _udt_socket_id, p );
-            p->wait();
-            s._udt_socket_id = UDT::accept( _udt_socket_id, (sockaddr*)&their_addr, &namelen );
-         }
-         else
-            check_udt_errors();
-      }
-  } FC_CAPTURE_AND_RETHROW() }
-
-  void udt_server::listen( const ip::endpoint& ep )
-  { try {
-      sockaddr_in my_addr;
-      my_addr.sin_family = AF_INET;
-      my_addr.sin_port = htons(ep.port());
-      my_addr.sin_addr.s_addr = INADDR_ANY;
-      memset(&(my_addr.sin_zero), '\0', 8);
-      
-      if( UDT::ERROR == UDT::bind(_udt_socket_id, (sockaddr*)&my_addr, sizeof(my_addr)) )
-        check_udt_errors();
-
-      UDT::listen(_udt_socket_id, 10);
-      check_udt_errors();
-  } FC_CAPTURE_AND_RETHROW( (ep) ) }
-
-  fc::ip::endpoint udt_server::local_endpoint() const
-  { try {
-     sockaddr_in sock_addr;
-     int addr_size = sizeof(sock_addr);
-     int error_code = UDT::getsockname( _udt_socket_id, (struct sockaddr*)&sock_addr, &addr_size );
-     if( error_code == UDT::ERROR )
-         check_udt_errors();
-     return ip::endpoint( ip::address( htonl( sock_addr.sin_addr.s_addr ) ), htons(sock_addr.sin_port) );
-  } FC_CAPTURE_AND_RETHROW() }
-
-} 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 50ff992..a1c9fef 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,13 +29,6 @@ target_link_libraries( hmac_test fc )
 add_executable( blinding_test blinding_test.cpp )
 target_link_libraries( blinding_test fc )
 
-
-add_executable( udt_server udts.cpp )
-target_link_libraries( udt_server fc udt )
-
-add_executable( udt_client udtc.cpp )
-target_link_libraries( udt_client fc udt )
-
 add_executable( ecc_test crypto/ecc_test.cpp )
 target_link_libraries( ecc_test fc )
 
diff --git a/vendor/udt4/CMakeLists.txt b/vendor/udt4/CMakeLists.txt
deleted file mode 100644
index cee52ed..0000000
--- a/vendor/udt4/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-
-IF( APPLE )
-   add_definitions( -DOSX )
-ELSEIF( WIN32 )
-   add_definitions( -DWIN32 )
-ELSE()
-   add_definitions( -DLINUX )
-ENDIF() 
-
-set( udt_sources 
-   src/api.cpp
-   src/buffer.cpp
-   src/cache.cpp
-   src/ccc.cpp
-   src/channel.cpp
-   src/common.cpp
-   src/core.cpp
-   src/epoll.cpp
-   src/list.cpp
-   src/md5.cpp
-   src/packet.cpp
-   src/queue.cpp
-   src/window.cpp
-   )
-
-add_library( udt ${udt_sources} )
diff --git a/vendor/udt4/LICENSE.txt b/vendor/udt4/LICENSE.txt
deleted file mode 100644
index eec89df..0000000
--- a/vendor/udt4/LICENSE.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above 
-  copyright notice, this list of conditions and the 
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/udt4/README.txt b/vendor/udt4/README.txt
deleted file mode 100644
index 105be42..0000000
--- a/vendor/udt4/README.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All Rights Reserved.
-Copyright (c) 2011 - 2012, Google, Inc. All Rights Reserved.
-
-UDP-based Data Transfer (UDT) Library - version 4
-Author: Yunhong Gu [yunhong.gu @ gmail.com]
-
-UDT version 4 is free software under BSD License. See ./LICENSE.txt.
-
-============================================================================
-
-UDT Website:
-http://udt.sf.net
-http://sf.net/projects/udt/ 
-
-
-CONTENT: 
-./src:     UDT source code 
-./app:     Example programs 
-./doc:     UDT documentation (HTML)
-./win:     Visual C++ project files for the Windows version of UDT 
-
-
-To make: 
-     make -e os=XXX arch=YYY 
-
-XXX: [LINUX(default), BSD, OSX] 
-YYY: [IA32(default), POWERPC, IA64, AMD64] 
-
-For example, on OS X, you may need to do "make -e os=OSX arch=POWERPC"; 
-on 32-bit i386 Linux system, simply use "make".
-
-On Windows systems, use the Visual C++ project files in ./win directory.
-
-Note for BSD users, please use GNU Make.
-
-To use UDT in your application:
-Read index.htm in ./doc. The documentation is in HTML format and requires your
-browser to support JavaScript.
-
-
-Questions? please post to the UDT project forum:
-https://sourceforge.net/projects/udt/forums
diff --git a/vendor/udt4/src/api.cpp b/vendor/udt4/src/api.cpp
deleted file mode 100644
index e444218..0000000
--- a/vendor/udt4/src/api.cpp
+++ /dev/null
@@ -1,2392 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 07/09/2011
-*****************************************************************************/
-
-#ifdef WIN32
-   #include <winsock2.h>
-   #include <ws2tcpip.h>
-   #ifdef LEGACY_WIN32
-      #include <wspiapi.h>
-   #endif
-#else
-   #include <unistd.h>
-#endif
-#include <cstring>
-#include "api.h"
-#include "core.h"
-
-using namespace std;
-
-CUDTSocket::CUDTSocket():
-m_Status(INIT),
-m_TimeStamp(0),
-m_iIPversion(0),
-m_pSelfAddr(NULL),
-m_pPeerAddr(NULL),
-m_SocketID(0),
-m_ListenSocket(0),
-m_PeerID(0),
-m_iISN(0),
-m_pUDT(NULL),
-m_pQueuedSockets(NULL),
-m_pAcceptSockets(NULL),
-m_AcceptCond(),
-m_AcceptLock(),
-m_uiBackLog(0),
-m_iMuxID(-1)
-{
-   #ifndef WIN32
-      pthread_mutex_init(&m_AcceptLock, NULL);
-      pthread_cond_init(&m_AcceptCond, NULL);
-      pthread_mutex_init(&m_ControlLock, NULL);
-   #else
-      m_AcceptLock = CreateMutex(NULL, false, NULL);
-      m_AcceptCond = CreateEvent(NULL, false, false, NULL);
-      m_ControlLock = CreateMutex(NULL, false, NULL);
-   #endif
-}
-
-CUDTSocket::~CUDTSocket()
-{
-   if (AF_INET == m_iIPversion)
-   {
-      delete (sockaddr_in*)m_pSelfAddr;
-      delete (sockaddr_in*)m_pPeerAddr;
-   }
-   else
-   {
-      delete (sockaddr_in6*)m_pSelfAddr;
-      delete (sockaddr_in6*)m_pPeerAddr;
-   }
-
-   delete m_pUDT;
-   m_pUDT = NULL;
-
-   delete m_pQueuedSockets;
-   delete m_pAcceptSockets;
-
-   #ifndef WIN32
-      pthread_mutex_destroy(&m_AcceptLock);
-      pthread_cond_destroy(&m_AcceptCond);
-      pthread_mutex_destroy(&m_ControlLock);
-   #else
-      CloseHandle(m_AcceptLock);
-      CloseHandle(m_AcceptCond);
-      CloseHandle(m_ControlLock);
-   #endif
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-CUDTUnited::CUDTUnited():
-m_Sockets(),
-m_ControlLock(),
-m_IDLock(),
-m_SocketID(0),
-m_TLSError(),
-m_mMultiplexer(),
-m_MultiplexerLock(),
-m_pCache(NULL),
-m_bClosing(false),
-m_GCStopLock(),
-m_GCStopCond(),
-m_InitLock(),
-m_iInstanceCount(0),
-m_bGCStatus(false),
-m_GCThread(),
-m_ClosedSockets()
-{
-   // Socket ID MUST start from a random value
-   srand((unsigned int)CTimer::getTime());
-   m_SocketID = 1 + (int)((1 << 30) * (double(rand()) / RAND_MAX));
-
-   #ifndef WIN32
-      pthread_mutex_init(&m_ControlLock, NULL);
-      pthread_mutex_init(&m_IDLock, NULL);
-      pthread_mutex_init(&m_InitLock, NULL);
-   #else
-      m_ControlLock = CreateMutex(NULL, false, NULL);
-      m_IDLock = CreateMutex(NULL, false, NULL);
-      m_InitLock = CreateMutex(NULL, false, NULL);
-   #endif
-
-   #ifndef WIN32
-      pthread_key_create(&m_TLSError, TLSDestroy);
-   #else
-      m_TLSError = TlsAlloc();
-      m_TLSLock = CreateMutex(NULL, false, NULL);
-   #endif
-
-   m_pCache = new CCache<CInfoBlock>;
-}
-
-CUDTUnited::~CUDTUnited()
-{
-   #ifndef WIN32
-      pthread_mutex_destroy(&m_ControlLock);
-      pthread_mutex_destroy(&m_IDLock);
-      pthread_mutex_destroy(&m_InitLock);
-   #else
-      CloseHandle(m_ControlLock);
-      CloseHandle(m_IDLock);
-      CloseHandle(m_InitLock);
-   #endif
-
-   #ifndef WIN32
-      pthread_key_delete(m_TLSError);
-   #else
-      TlsFree(m_TLSError);
-      CloseHandle(m_TLSLock);
-   #endif
-
-   delete m_pCache;
-}
-
-int CUDTUnited::startup()
-{
-   CGuard gcinit(m_InitLock);
-
-   if (m_iInstanceCount++ > 0)
-      return 0;
-
-   // Global initialization code
-   #ifdef WIN32
-      WORD wVersionRequested;
-      WSADATA wsaData;
-      wVersionRequested = MAKEWORD(2, 2);
-
-      if (0 != WSAStartup(wVersionRequested, &wsaData))
-         throw CUDTException(1, 0,  WSAGetLastError());
-   #endif
-
-   //init CTimer::EventLock
-
-   if (m_bGCStatus)
-      return true;
-
-   m_bClosing = false;
-   #ifndef WIN32
-      pthread_mutex_init(&m_GCStopLock, NULL);
-      pthread_cond_init(&m_GCStopCond, NULL);
-      pthread_create(&m_GCThread, NULL, garbageCollect, this);
-   #else
-      m_GCStopLock = CreateMutex(NULL, false, NULL);
-      m_GCStopCond = CreateEvent(NULL, false, false, NULL);
-      DWORD ThreadID;
-      m_GCThread = CreateThread(NULL, 0, garbageCollect, this, 0, &ThreadID);
-   #endif
-
-   m_bGCStatus = true;
-
-   return 0;
-}
-
-int CUDTUnited::cleanup()
-{
-   CGuard gcinit(m_InitLock);
-
-   if (--m_iInstanceCount > 0)
-      return 0;
-
-   //destroy CTimer::EventLock
-
-   if (!m_bGCStatus)
-      return 0;
-
-   m_bClosing = true;
-   #ifndef WIN32
-      pthread_cond_signal(&m_GCStopCond);
-      pthread_join(m_GCThread, NULL);
-      pthread_mutex_destroy(&m_GCStopLock);
-      pthread_cond_destroy(&m_GCStopCond);
-   #else
-      SetEvent(m_GCStopCond);
-      WaitForSingleObject(m_GCThread, INFINITE);
-      CloseHandle(m_GCThread);
-      CloseHandle(m_GCStopLock);
-      CloseHandle(m_GCStopCond);
-   #endif
-
-   m_bGCStatus = false;
-
-   // Global destruction code
-   #ifdef WIN32
-      WSACleanup();
-   #endif
-
-   return 0;
-}
-
-UDTSOCKET CUDTUnited::newSocket(int af, int type)
-{
-   if ((type != SOCK_STREAM) && (type != SOCK_DGRAM))
-      throw CUDTException(5, 3, 0);
-
-   CUDTSocket* ns = NULL;
-
-   try
-   {
-      ns = new CUDTSocket;
-      ns->m_pUDT = new CUDT;
-      if (AF_INET == af)
-      {
-         ns->m_pSelfAddr = (sockaddr*)(new sockaddr_in);
-         ((sockaddr_in*)(ns->m_pSelfAddr))->sin_port = 0;
-      }
-      else
-      {
-         ns->m_pSelfAddr = (sockaddr*)(new sockaddr_in6);
-         ((sockaddr_in6*)(ns->m_pSelfAddr))->sin6_port = 0;
-      }
-   }
-   catch (...)
-   {
-      delete ns;
-      throw CUDTException(3, 2, 0);
-   }
-
-   CGuard::enterCS(m_IDLock);
-   ns->m_SocketID = -- m_SocketID;
-   CGuard::leaveCS(m_IDLock);
-
-   ns->m_Status = INIT;
-   ns->m_ListenSocket = 0;
-   ns->m_pUDT->m_SocketID = ns->m_SocketID;
-   ns->m_pUDT->m_iSockType = (SOCK_STREAM == type) ? UDT_STREAM : UDT_DGRAM;
-   ns->m_pUDT->m_iIPversion = ns->m_iIPversion = af;
-   ns->m_pUDT->m_pCache = m_pCache;
-
-   // protect the m_Sockets structure.
-   CGuard::enterCS(m_ControlLock);
-   try
-   {
-      m_Sockets[ns->m_SocketID] = ns;
-   }
-   catch (...)
-   {
-      //failure and rollback
-      CGuard::leaveCS(m_ControlLock);
-      delete ns;
-      ns = NULL;
-   }
-   CGuard::leaveCS(m_ControlLock);
-
-   if (NULL == ns)
-      throw CUDTException(3, 2, 0);
-
-   return ns->m_SocketID;
-}
-
-int CUDTUnited::newConnection(const UDTSOCKET listen, const sockaddr* peer, CHandShake* hs)
-{
-   CUDTSocket* ns = NULL;
-   CUDTSocket* ls = locate(listen);
-
-   if (NULL == ls)
-      return -1;
-
-   // if this connection has already been processed
-   if (NULL != (ns = locate(peer, hs->m_iID, hs->m_iISN)))
-   {
-      if (ns->m_pUDT->m_bBroken)
-      {
-         // last connection from the "peer" address has been broken
-         ns->m_Status = CLOSED;
-         ns->m_TimeStamp = CTimer::getTime();
-
-         CGuard::enterCS(ls->m_AcceptLock);
-         ls->m_pQueuedSockets->erase(ns->m_SocketID);
-         ls->m_pAcceptSockets->erase(ns->m_SocketID);
-         CGuard::leaveCS(ls->m_AcceptLock);
-      }
-      else
-      {
-         // connection already exist, this is a repeated connection request
-         // respond with existing HS information
-
-         hs->m_iISN = ns->m_pUDT->m_iISN;
-         hs->m_iMSS = ns->m_pUDT->m_iMSS;
-         hs->m_iFlightFlagSize = ns->m_pUDT->m_iFlightFlagSize;
-         hs->m_iReqType = -1;
-         hs->m_iID = ns->m_SocketID;
-
-         return 0;
-
-         //except for this situation a new connection should be started
-      }
-   }
-
-   // exceeding backlog, refuse the connection request
-   if (ls->m_pQueuedSockets->size() >= ls->m_uiBackLog)
-      return -1;
-
-   try
-   {
-      ns = new CUDTSocket;
-      ns->m_pUDT = new CUDT(*(ls->m_pUDT));
-      if (AF_INET == ls->m_iIPversion)
-      {
-         ns->m_pSelfAddr = (sockaddr*)(new sockaddr_in);
-         ((sockaddr_in*)(ns->m_pSelfAddr))->sin_port = 0;
-         ns->m_pPeerAddr = (sockaddr*)(new sockaddr_in);
-         memcpy(ns->m_pPeerAddr, peer, sizeof(sockaddr_in));
-      }
-      else
-      {
-         ns->m_pSelfAddr = (sockaddr*)(new sockaddr_in6);
-         ((sockaddr_in6*)(ns->m_pSelfAddr))->sin6_port = 0;
-         ns->m_pPeerAddr = (sockaddr*)(new sockaddr_in6);
-         memcpy(ns->m_pPeerAddr, peer, sizeof(sockaddr_in6));
-      }
-   }
-   catch (...)
-   {
-      delete ns;
-      return -1;
-   }
-
-   CGuard::enterCS(m_IDLock);
-   ns->m_SocketID = -- m_SocketID;
-   CGuard::leaveCS(m_IDLock);
-
-   ns->m_ListenSocket = listen;
-   ns->m_iIPversion = ls->m_iIPversion;
-   ns->m_pUDT->m_SocketID = ns->m_SocketID;
-   ns->m_PeerID = hs->m_iID;
-   ns->m_iISN = hs->m_iISN;
-
-   int error = 0;
-
-   try
-   {
-      // bind to the same addr of listening socket
-      ns->m_pUDT->open();
-      updateMux(ns, ls);
-      ns->m_pUDT->connect(peer, hs);
-   }
-   catch (...)
-   {
-      error = 1;
-      goto ERR_ROLLBACK;
-   }
-
-   ns->m_Status = CONNECTED;
-
-   // copy address information of local node
-   ns->m_pUDT->m_pSndQueue->m_pChannel->getSockAddr(ns->m_pSelfAddr);
-   CIPAddress::pton(ns->m_pSelfAddr, ns->m_pUDT->m_piSelfIP, ns->m_iIPversion);
-
-   // protect the m_Sockets structure.
-   CGuard::enterCS(m_ControlLock);
-   try
-   {
-      m_Sockets[ns->m_SocketID] = ns;
-      m_PeerRec[(ns->m_PeerID << 30) + ns->m_iISN].insert(ns->m_SocketID);
-   }
-   catch (...)
-   {
-      error = 2;
-   }
-   CGuard::leaveCS(m_ControlLock);
-
-   CGuard::enterCS(ls->m_AcceptLock);
-   try
-   {
-      ls->m_pQueuedSockets->insert(ns->m_SocketID);
-   }
-   catch (...)
-   {
-      error = 3;
-   }
-   CGuard::leaveCS(ls->m_AcceptLock);
-
-   // acknowledge users waiting for new connections on the listening socket
-   m_EPoll.update_events(listen, ls->m_pUDT->m_sPollID, UDT_EPOLL_IN, true);
-
-   CTimer::triggerEvent();
-
-   ERR_ROLLBACK:
-   if (error > 0)
-   {
-      ns->m_pUDT->close();
-      ns->m_Status = CLOSED;
-      ns->m_TimeStamp = CTimer::getTime();
-
-      return -1;
-   }
-
-   // wake up a waiting accept() call
-   #ifndef WIN32
-      pthread_mutex_lock(&(ls->m_AcceptLock));
-      pthread_cond_signal(&(ls->m_AcceptCond));
-      pthread_mutex_unlock(&(ls->m_AcceptLock));
-   #else
-      SetEvent(ls->m_AcceptCond);
-   #endif
-
-   return 1;
-}
-
-CUDT* CUDTUnited::lookup(const UDTSOCKET u)
-{
-   // protects the m_Sockets structure
-   CGuard cg(m_ControlLock);
-
-   map<UDTSOCKET, CUDTSocket*>::iterator i = m_Sockets.find(u);
-
-   if ((i == m_Sockets.end()) || (i->second->m_Status == CLOSED))
-      throw CUDTException(5, 4, 0);
-
-   return i->second->m_pUDT;
-}
-
-UDTSTATUS CUDTUnited::getStatus(const UDTSOCKET u)
-{
-   // protects the m_Sockets structure
-   CGuard cg(m_ControlLock);
-
-   map<UDTSOCKET, CUDTSocket*>::iterator i = m_Sockets.find(u);
-
-   if (i == m_Sockets.end())
-   {
-      if (m_ClosedSockets.find(u) != m_ClosedSockets.end())
-         return CLOSED;
-
-      return NONEXIST;
-   }
-
-   if (i->second->m_pUDT->m_bBroken)
-      return BROKEN;
-
-   return i->second->m_Status;   
-}
-
-int CUDTUnited::bind(const UDTSOCKET u, const sockaddr* name, int namelen)
-{
-   CUDTSocket* s = locate(u);
-   if (NULL == s)
-      throw CUDTException(5, 4, 0);
-
-   CGuard cg(s->m_ControlLock);
-
-   // cannot bind a socket more than once
-   if (INIT != s->m_Status)
-      throw CUDTException(5, 0, 0);
-
-   // check the size of SOCKADDR structure
-   if (AF_INET == s->m_iIPversion)
-   {
-      if (namelen != sizeof(sockaddr_in))
-         throw CUDTException(5, 3, 0);
-   }
-   else
-   {
-      if (namelen != sizeof(sockaddr_in6))
-         throw CUDTException(5, 3, 0);
-   }
-
-   s->m_pUDT->open();
-   updateMux(s, name);
-   s->m_Status = OPENED;
-
-   // copy address information of local node
-   s->m_pUDT->m_pSndQueue->m_pChannel->getSockAddr(s->m_pSelfAddr);
-
-   return 0;
-}
-
-int CUDTUnited::bind(UDTSOCKET u, UDPSOCKET udpsock)
-{
-   CUDTSocket* s = locate(u);
-   if (NULL == s)
-      throw CUDTException(5, 4, 0);
-
-   CGuard cg(s->m_ControlLock);
-
-   // cannot bind a socket more than once
-   if (INIT != s->m_Status)
-      throw CUDTException(5, 0, 0);
-
-   sockaddr_in name4;
-   sockaddr_in6 name6;
-   sockaddr* name;
-   socklen_t namelen;
-
-   if (AF_INET == s->m_iIPversion)
-   {
-      namelen = sizeof(sockaddr_in);
-      name = (sockaddr*)&name4;
-   }
-   else
-   {
-      namelen = sizeof(sockaddr_in6);
-      name = (sockaddr*)&name6;
-   }
-
-   if (-1 == ::getsockname(udpsock, name, &namelen))
-      throw CUDTException(5, 3);
-
-   s->m_pUDT->open();
-   updateMux(s, name, &udpsock);
-   s->m_Status = OPENED;
-
-   // copy address information of local node
-   s->m_pUDT->m_pSndQueue->m_pChannel->getSockAddr(s->m_pSelfAddr);
-
-   return 0;
-}
-
-int CUDTUnited::listen(const UDTSOCKET u, int backlog)
-{
-   CUDTSocket* s = locate(u);
-   if (NULL == s)
-      throw CUDTException(5, 4, 0);
-
-   CGuard cg(s->m_ControlLock);
-
-   // do nothing if the socket is already listening
-   if (LISTENING == s->m_Status)
-      return 0;
-
-   // a socket can listen only if is in OPENED status
-   if (OPENED != s->m_Status)
-      throw CUDTException(5, 5, 0);
-
-   // listen is not supported in rendezvous connection setup
-   if (s->m_pUDT->m_bRendezvous)
-      throw CUDTException(5, 7, 0);
-
-   if (backlog <= 0)
-      throw CUDTException(5, 3, 0);
-
-   s->m_uiBackLog = backlog;
-
-   try
-   {
-      s->m_pQueuedSockets = new set<UDTSOCKET>;
-      s->m_pAcceptSockets = new set<UDTSOCKET>;
-   }
-   catch (...)
-   {
-      delete s->m_pQueuedSockets;
-      delete s->m_pAcceptSockets;
-      throw CUDTException(3, 2, 0);
-   }
-
-   s->m_pUDT->listen();
-
-   s->m_Status = LISTENING;
-
-   return 0;
-}
-
-UDTSOCKET CUDTUnited::accept(const UDTSOCKET listen, sockaddr* addr, int* addrlen)
-{
-   if ((NULL != addr) && (NULL == addrlen))
-      throw CUDTException(5, 3, 0);
-
-   CUDTSocket* ls = locate(listen);
-
-   if (ls == NULL)
-      throw CUDTException(5, 4, 0);
-
-   // the "listen" socket must be in LISTENING status
-   if (LISTENING != ls->m_Status)
-      throw CUDTException(5, 6, 0);
-
-   // no "accept" in rendezvous connection setup
-   if (ls->m_pUDT->m_bRendezvous)
-      throw CUDTException(5, 7, 0);
-
-   UDTSOCKET u = CUDT::INVALID_SOCK;
-   bool accepted = false;
-
-   // !!only one conection can be set up each time!!
-   #ifndef WIN32
-      while (!accepted)
-      {
-         pthread_mutex_lock(&(ls->m_AcceptLock));
-
-         if ((LISTENING != ls->m_Status) || ls->m_pUDT->m_bBroken)
-         {
-            // This socket has been closed.
-            accepted = true;
-         }
-         else if (ls->m_pQueuedSockets->size() > 0)
-         {
-            u = *(ls->m_pQueuedSockets->begin());
-            ls->m_pAcceptSockets->insert(ls->m_pAcceptSockets->end(), u);
-            ls->m_pQueuedSockets->erase(ls->m_pQueuedSockets->begin());
-            accepted = true;
-         }
-         else if (!ls->m_pUDT->m_bSynRecving)
-         {
-            accepted = true;
-         }
-
-         if (!accepted && (LISTENING == ls->m_Status))
-            pthread_cond_wait(&(ls->m_AcceptCond), &(ls->m_AcceptLock));
-
-         if (ls->m_pQueuedSockets->empty())
-            m_EPoll.update_events(listen, ls->m_pUDT->m_sPollID, UDT_EPOLL_IN, false);
-
-         pthread_mutex_unlock(&(ls->m_AcceptLock));
-      }
-   #else
-      while (!accepted)
-      {
-         WaitForSingleObject(ls->m_AcceptLock, INFINITE);
-
-         if (ls->m_pQueuedSockets->size() > 0)
-         {
-            u = *(ls->m_pQueuedSockets->begin());
-            ls->m_pAcceptSockets->insert(ls->m_pAcceptSockets->end(), u);
-            ls->m_pQueuedSockets->erase(ls->m_pQueuedSockets->begin());
-
-            accepted = true;
-         }
-         else if (!ls->m_pUDT->m_bSynRecving)
-            accepted = true;
-
-         ReleaseMutex(ls->m_AcceptLock);
-
-         if  (!accepted & (LISTENING == ls->m_Status))
-            WaitForSingleObject(ls->m_AcceptCond, INFINITE);
-
-         if ((LISTENING != ls->m_Status) || ls->m_pUDT->m_bBroken)
-         {
-            // Send signal to other threads that are waiting to accept.
-            SetEvent(ls->m_AcceptCond);
-            accepted = true;
-         }
-
-         if (ls->m_pQueuedSockets->empty())
-            m_EPoll.update_events(listen, ls->m_pUDT->m_sPollID, UDT_EPOLL_IN, false);
-      }
-   #endif
-
-   if (u == CUDT::INVALID_SOCK)
-   {
-      // non-blocking receiving, no connection available
-      if (!ls->m_pUDT->m_bSynRecving)
-         throw CUDTException(6, 2, 0);
-
-      // listening socket is closed
-      throw CUDTException(5, 6, 0);
-   }
-
-   if ((addr != NULL) && (addrlen != NULL))
-   {
-      if (AF_INET == locate(u)->m_iIPversion)
-         *addrlen = sizeof(sockaddr_in);
-      else
-         *addrlen = sizeof(sockaddr_in6);
-
-      // copy address information of peer node
-      memcpy(addr, locate(u)->m_pPeerAddr, *addrlen);
-   }
-
-   return u;
-}
-
-int CUDTUnited::connect(const UDTSOCKET u, const sockaddr* name, int namelen)
-{
-   CUDTSocket* s = locate(u);
-   if (NULL == s)
-      throw CUDTException(5, 4, 0);
-
-   CGuard cg(s->m_ControlLock);
-
-   // check the size of SOCKADDR structure
-   if (AF_INET == s->m_iIPversion)
-   {
-      if (namelen != sizeof(sockaddr_in))
-         throw CUDTException(5, 3, 0);
-   }
-   else
-   {
-      if (namelen != sizeof(sockaddr_in6))
-         throw CUDTException(5, 3, 0);
-   }
-
-   // a socket can "connect" only if it is in INIT or OPENED status
-   if (INIT == s->m_Status)
-   {
-      if (!s->m_pUDT->m_bRendezvous)
-      {
-         s->m_pUDT->open();
-         updateMux(s);
-         s->m_Status = OPENED;
-      }
-      else
-         throw CUDTException(5, 8, 0);
-   }
-   else if (OPENED != s->m_Status)
-      throw CUDTException(5, 2, 0);
-
-   // connect_complete() may be called before connect() returns.
-   // So we need to update the status before connect() is called,
-   // otherwise the status may be overwritten with wrong value (CONNECTED vs. CONNECTING).
-   s->m_Status = CONNECTING;
-   try
-   {
-      s->m_pUDT->connect(name);
-   }
-   catch (CUDTException e)
-   {
-      s->m_Status = OPENED;
-      throw e;
-   }
-
-   // record peer address
-   delete s->m_pPeerAddr;
-   if (AF_INET == s->m_iIPversion)
-   {
-      s->m_pPeerAddr = (sockaddr*)(new sockaddr_in);
-      memcpy(s->m_pPeerAddr, name, sizeof(sockaddr_in));
-   }
-   else
-   {
-      s->m_pPeerAddr = (sockaddr*)(new sockaddr_in6);
-      memcpy(s->m_pPeerAddr, name, sizeof(sockaddr_in6));
-   }
-
-   return 0;
-}
-
-void CUDTUnited::connect_complete(const UDTSOCKET u)
-{
-   CUDTSocket* s = locate(u);
-   if (NULL == s)
-      throw CUDTException(5, 4, 0);
-
-   // copy address information of local node
-   // the local port must be correctly assigned BEFORE CUDT::connect(),
-   // otherwise if connect() fails, the multiplexer cannot be located by garbage collection and will cause leak
-   s->m_pUDT->m_pSndQueue->m_pChannel->getSockAddr(s->m_pSelfAddr);
-   CIPAddress::pton(s->m_pSelfAddr, s->m_pUDT->m_piSelfIP, s->m_iIPversion);
-
-   s->m_Status = CONNECTED;
-}
-
-int CUDTUnited::close(const UDTSOCKET u)
-{
-   CUDTSocket* s = locate(u);
-   if (NULL == s)
-      throw CUDTException(5, 4, 0);
-
-   CGuard socket_cg(s->m_ControlLock);
-
-   if (s->m_Status == LISTENING)
-   {
-      if (s->m_pUDT->m_bBroken)
-         return 0;
-
-      s->m_TimeStamp = CTimer::getTime();
-      s->m_pUDT->m_bBroken = true;
-
-      // broadcast all "accept" waiting
-      #ifndef WIN32
-         pthread_mutex_lock(&(s->m_AcceptLock));
-         pthread_cond_broadcast(&(s->m_AcceptCond));
-         pthread_mutex_unlock(&(s->m_AcceptLock));
-      #else
-         SetEvent(s->m_AcceptCond);
-      #endif
-
-      return 0;
-   }
-
-   s->m_pUDT->close();
-
-   // synchronize with garbage collection.
-   CGuard manager_cg(m_ControlLock);
-
-   // since "s" is located before m_ControlLock, locate it again in case it became invalid
-   map<UDTSOCKET, CUDTSocket*>::iterator i = m_Sockets.find(u);
-   if ((i == m_Sockets.end()) || (i->second->m_Status == CLOSED))
-      return 0;
-   s = i->second;
-
-   s->m_Status = CLOSED;
-
-   // a socket will not be immediated removed when it is closed
-   // in order to prevent other methods from accessing invalid address
-   // a timer is started and the socket will be removed after approximately 1 second
-   s->m_TimeStamp = CTimer::getTime();
-
-   m_Sockets.erase(s->m_SocketID);
-   m_ClosedSockets.insert(pair<UDTSOCKET, CUDTSocket*>(s->m_SocketID, s));
-
-   CTimer::triggerEvent();
-
-   return 0;
-}
-
-int CUDTUnited::getpeername(const UDTSOCKET u, sockaddr* name, int* namelen)
-{
-   if (CONNECTED != getStatus(u))
-      throw CUDTException(2, 2, 0);
-
-   CUDTSocket* s = locate(u);
-
-   if (NULL == s)
-      throw CUDTException(5, 4, 0);
-
-   if (!s->m_pUDT->m_bConnected || s->m_pUDT->m_bBroken)
-      throw CUDTException(2, 2, 0);
-
-   if (AF_INET == s->m_iIPversion)
-      *namelen = sizeof(sockaddr_in);
-   else
-      *namelen = sizeof(sockaddr_in6);
-
-   // copy address information of peer node
-   memcpy(name, s->m_pPeerAddr, *namelen);
-
-   return 0;
-}
-
-int CUDTUnited::getsockname(const UDTSOCKET u, sockaddr* name, int* namelen)
-{
-   CUDTSocket* s = locate(u);
-
-   if (NULL == s)
-      throw CUDTException(5, 4, 0);
-
-   if (s->m_pUDT->m_bBroken)
-      throw CUDTException(5, 4, 0);
-
-   if (INIT == s->m_Status)
-      throw CUDTException(2, 2, 0);
-
-   if (AF_INET == s->m_iIPversion)
-      *namelen = sizeof(sockaddr_in);
-   else
-      *namelen = sizeof(sockaddr_in6);
-
-   // copy address information of local node
-   memcpy(name, s->m_pSelfAddr, *namelen);
-
-   return 0;
-}
-
-int CUDTUnited::select(ud_set* readfds, ud_set* writefds, ud_set* exceptfds, const timeval* timeout)
-{
-   uint64_t entertime = CTimer::getTime();
-
-   uint64_t to;
-   if (NULL == timeout)
-      to = 0xFFFFFFFFFFFFFFFFULL;
-   else
-      to = timeout->tv_sec * 1000000 + timeout->tv_usec;
-
-   // initialize results
-   int count = 0;
-   set<UDTSOCKET> rs, ws, es;
-
-   // retrieve related UDT sockets
-   vector<CUDTSocket*> ru, wu, eu;
-   CUDTSocket* s;
-   if (NULL != readfds)
-      for (set<UDTSOCKET>::iterator i1 = readfds->begin(); i1 != readfds->end(); ++ i1)
-      {
-         if (BROKEN == getStatus(*i1))
-         {
-            rs.insert(*i1);
-            ++ count;
-         }
-         else if (NULL == (s = locate(*i1)))
-            throw CUDTException(5, 4, 0);
-         else
-            ru.push_back(s);
-      }
-   if (NULL != writefds)
-      for (set<UDTSOCKET>::iterator i2 = writefds->begin(); i2 != writefds->end(); ++ i2)
-      {
-         if (BROKEN == getStatus(*i2))
-         {
-            ws.insert(*i2);
-            ++ count;
-         }
-         else if (NULL == (s = locate(*i2)))
-            throw CUDTException(5, 4, 0);
-         else
-            wu.push_back(s);
-      }
-   if (NULL != exceptfds)
-      for (set<UDTSOCKET>::iterator i3 = exceptfds->begin(); i3 != exceptfds->end(); ++ i3)
-      {
-         if (BROKEN == getStatus(*i3))
-         {
-            es.insert(*i3);
-            ++ count;
-         }
-         else if (NULL == (s = locate(*i3)))
-            throw CUDTException(5, 4, 0);
-         else
-            eu.push_back(s);
-      }
-
-   do
-   {
-      // query read sockets
-      for (vector<CUDTSocket*>::iterator j1 = ru.begin(); j1 != ru.end(); ++ j1)
-      {
-         s = *j1;
-
-         if ((s->m_pUDT->m_bConnected && (s->m_pUDT->m_pRcvBuffer->getRcvDataSize() > 0) && ((s->m_pUDT->m_iSockType == UDT_STREAM) || (s->m_pUDT->m_pRcvBuffer->getRcvMsgNum() > 0)))
-            || (!s->m_pUDT->m_bListening && (s->m_pUDT->m_bBroken || !s->m_pUDT->m_bConnected))
-            || (s->m_pUDT->m_bListening && (s->m_pQueuedSockets->size() > 0))
-            || (s->m_Status == CLOSED))
-         {
-            rs.insert(s->m_SocketID);
-            ++ count;
-         }
-      }
-
-      // query write sockets
-      for (vector<CUDTSocket*>::iterator j2 = wu.begin(); j2 != wu.end(); ++ j2)
-      {
-         s = *j2;
-
-         if ((s->m_pUDT->m_bConnected && (s->m_pUDT->m_pSndBuffer->getCurrBufSize() < s->m_pUDT->m_iSndBufSize))
-            || s->m_pUDT->m_bBroken || !s->m_pUDT->m_bConnected || (s->m_Status == CLOSED))
-         {
-            ws.insert(s->m_SocketID);
-            ++ count;
-         }
-      }
-
-      // query exceptions on sockets
-      for (vector<CUDTSocket*>::iterator j3 = eu.begin(); j3 != eu.end(); ++ j3)
-      {
-         // check connection request status, not supported now
-      }
-
-      if (0 < count)
-         break;
-
-      CTimer::waitForEvent();
-   } while (to > CTimer::getTime() - entertime);
-
-   if (NULL != readfds)
-      *readfds = rs;
-
-   if (NULL != writefds)
-      *writefds = ws;
-
-   if (NULL != exceptfds)
-      *exceptfds = es;
-
-   return count;
-}
-
-int CUDTUnited::selectEx(const vector<UDTSOCKET>& fds, vector<UDTSOCKET>* readfds, vector<UDTSOCKET>* writefds, vector<UDTSOCKET>* exceptfds, int64_t msTimeOut)
-{
-   uint64_t entertime = CTimer::getTime();
-
-   uint64_t to;
-   if (msTimeOut >= 0)
-      to = msTimeOut * 1000;
-   else
-      to = 0xFFFFFFFFFFFFFFFFULL;
-
-   // initialize results
-   int count = 0;
-   if (NULL != readfds)
-      readfds->clear();
-   if (NULL != writefds)
-      writefds->clear();
-   if (NULL != exceptfds)
-      exceptfds->clear();
-
-   do
-   {
-      for (vector<UDTSOCKET>::const_iterator i = fds.begin(); i != fds.end(); ++ i)
-      {
-         CUDTSocket* s = locate(*i);
-
-         if ((NULL == s) || s->m_pUDT->m_bBroken || (s->m_Status == CLOSED))
-         {
-            if (NULL != exceptfds)
-            {
-               exceptfds->push_back(*i);
-               ++ count;
-            }
-            continue;
-         }
-
-         if (NULL != readfds)
-         {
-            if ((s->m_pUDT->m_bConnected && (s->m_pUDT->m_pRcvBuffer->getRcvDataSize() > 0) && ((s->m_pUDT->m_iSockType == UDT_STREAM) || (s->m_pUDT->m_pRcvBuffer->getRcvMsgNum() > 0)))
-               || (s->m_pUDT->m_bListening && (s->m_pQueuedSockets->size() > 0)))
-            {
-               readfds->push_back(s->m_SocketID);
-               ++ count;
-            }
-         }
-
-         if (NULL != writefds)
-         {
-            if (s->m_pUDT->m_bConnected && (s->m_pUDT->m_pSndBuffer->getCurrBufSize() < s->m_pUDT->m_iSndBufSize))
-            {
-               writefds->push_back(s->m_SocketID);
-               ++ count;
-            }
-         }
-      }
-
-      if (count > 0)
-         break;
-
-      CTimer::waitForEvent();
-   } while (to > CTimer::getTime() - entertime);
-
-   return count;
-}
-
-int CUDTUnited::epoll_create()
-{
-   return m_EPoll.create();
-}
-
-int CUDTUnited::epoll_add_usock(const int eid, const UDTSOCKET u, const int* events)
-{
-   CUDTSocket* s = locate(u);
-   int ret = -1;
-   if (NULL != s)
-   {
-      ret = m_EPoll.add_usock(eid, u, events);
-      s->m_pUDT->addEPoll(eid);
-   }
-   else
-   {
-      throw CUDTException(5, 4);
-   }
-
-   return ret;
-}
-
-int CUDTUnited::epoll_add_ssock(const int eid, const SYSSOCKET s, const int* events)
-{
-   return m_EPoll.add_ssock(eid, s, events);
-}
-
-int CUDTUnited::epoll_remove_usock(const int eid, const UDTSOCKET u)
-{
-   int ret = m_EPoll.remove_usock(eid, u);
-
-   CUDTSocket* s = locate(u);
-   if (NULL != s)
-   {
-      s->m_pUDT->removeEPoll(eid);
-   }
-   //else
-   //{
-   //   throw CUDTException(5, 4);
-   //}
-
-   return ret;
-}
-
-int CUDTUnited::epoll_remove_ssock(const int eid, const SYSSOCKET s)
-{
-   return m_EPoll.remove_ssock(eid, s);
-}
-
-int CUDTUnited::epoll_wait(const int eid, set<UDTSOCKET>* readfds, set<UDTSOCKET>* writefds, int64_t msTimeOut, set<SYSSOCKET>* lrfds, set<SYSSOCKET>* lwfds)
-{
-   return m_EPoll.wait(eid, readfds, writefds, msTimeOut, lrfds, lwfds);
-}
-
-int CUDTUnited::epoll_release(const int eid)
-{
-   return m_EPoll.release(eid);
-}
-
-CUDTSocket* CUDTUnited::locate(const UDTSOCKET u)
-{
-   CGuard cg(m_ControlLock);
-
-   map<UDTSOCKET, CUDTSocket*>::iterator i = m_Sockets.find(u);
-
-   if ((i == m_Sockets.end()) || (i->second->m_Status == CLOSED))
-      return NULL;
-
-   return i->second;
-}
-
-CUDTSocket* CUDTUnited::locate(const sockaddr* peer, const UDTSOCKET id, int32_t isn)
-{
-   CGuard cg(m_ControlLock);
-
-   map<int64_t, set<UDTSOCKET> >::iterator i = m_PeerRec.find((id << 30) + isn);
-   if (i == m_PeerRec.end())
-      return NULL;
-
-   for (set<UDTSOCKET>::iterator j = i->second.begin(); j != i->second.end(); ++ j)
-   {
-      map<UDTSOCKET, CUDTSocket*>::iterator k = m_Sockets.find(*j);
-      // this socket might have been closed and moved m_ClosedSockets
-      if (k == m_Sockets.end())
-         continue;
-
-      if (CIPAddress::ipcmp(peer, k->second->m_pPeerAddr, k->second->m_iIPversion))
-         return k->second;
-   }
-
-   return NULL;
-}
-
-void CUDTUnited::checkBrokenSockets()
-{
-   CGuard cg(m_ControlLock);
-
-   // set of sockets To Be Closed and To Be Removed
-   vector<UDTSOCKET> tbc;
-   vector<UDTSOCKET> tbr;
-
-   for (map<UDTSOCKET, CUDTSocket*>::iterator i = m_Sockets.begin(); i != m_Sockets.end(); ++ i)
-   {
-      // check broken connection
-      if (i->second->m_pUDT->m_bBroken)
-      {
-         if (i->second->m_Status == LISTENING)
-         {
-            // for a listening socket, it should wait an extra 3 seconds in case a client is connecting
-            if (CTimer::getTime() - i->second->m_TimeStamp < 3000000)
-               continue;
-         }
-         else if ((i->second->m_pUDT->m_pRcvBuffer != NULL) && (i->second->m_pUDT->m_pRcvBuffer->getRcvDataSize() > 0) && (i->second->m_pUDT->m_iBrokenCounter -- > 0))
-         {
-            // if there is still data in the receiver buffer, wait longer
-            continue;
-         }
-
-         //close broken connections and start removal timer
-         i->second->m_Status = CLOSED;
-         i->second->m_TimeStamp = CTimer::getTime();
-         tbc.push_back(i->first);
-         m_ClosedSockets[i->first] = i->second;
-
-         // remove from listener's queue
-         map<UDTSOCKET, CUDTSocket*>::iterator ls = m_Sockets.find(i->second->m_ListenSocket);
-         if (ls == m_Sockets.end())
-         {
-            ls = m_ClosedSockets.find(i->second->m_ListenSocket);
-            if (ls == m_ClosedSockets.end())
-               continue;
-         }
-
-         CGuard::enterCS(ls->second->m_AcceptLock);
-         ls->second->m_pQueuedSockets->erase(i->second->m_SocketID);
-         ls->second->m_pAcceptSockets->erase(i->second->m_SocketID);
-         CGuard::leaveCS(ls->second->m_AcceptLock);
-      }
-   }
-
-   for (map<UDTSOCKET, CUDTSocket*>::iterator j = m_ClosedSockets.begin(); j != m_ClosedSockets.end(); ++ j)
-   {
-      if (j->second->m_pUDT->m_ullLingerExpiration > 0)
-      {
-         // asynchronous close: 
-         if ((NULL == j->second->m_pUDT->m_pSndBuffer) || (0 == j->second->m_pUDT->m_pSndBuffer->getCurrBufSize()) || (j->second->m_pUDT->m_ullLingerExpiration <= CTimer::getTime()))
-         {
-            j->second->m_pUDT->m_ullLingerExpiration = 0;
-            j->second->m_pUDT->m_bClosing = true;
-            j->second->m_TimeStamp = CTimer::getTime();
-         }
-      }
-
-      // timeout 1 second to destroy a socket AND it has been removed from RcvUList
-      if ((CTimer::getTime() - j->second->m_TimeStamp > 1000000) && ((NULL == j->second->m_pUDT->m_pRNode) || !j->second->m_pUDT->m_pRNode->m_bOnList))
-      {
-         tbr.push_back(j->first);
-      }
-   }
-
-   // move closed sockets to the ClosedSockets structure
-   for (vector<UDTSOCKET>::iterator k = tbc.begin(); k != tbc.end(); ++ k)
-      m_Sockets.erase(*k);
-
-   // remove those timeout sockets
-   for (vector<UDTSOCKET>::iterator l = tbr.begin(); l != tbr.end(); ++ l)
-      removeSocket(*l);
-}
-
-void CUDTUnited::removeSocket(const UDTSOCKET u)
-{
-   map<UDTSOCKET, CUDTSocket*>::iterator i = m_ClosedSockets.find(u);
-
-   // invalid socket ID
-   if (i == m_ClosedSockets.end())
-      return;
-
-   // decrease multiplexer reference count, and remove it if necessary
-   const int mid = i->second->m_iMuxID;
-
-   if (NULL != i->second->m_pQueuedSockets)
-   {
-      CGuard::enterCS(i->second->m_AcceptLock);
-
-      // if it is a listener, close all un-accepted sockets in its queue and remove them later
-      for (set<UDTSOCKET>::iterator q = i->second->m_pQueuedSockets->begin(); q != i->second->m_pQueuedSockets->end(); ++ q)
-      {
-         m_Sockets[*q]->m_pUDT->m_bBroken = true;
-         m_Sockets[*q]->m_pUDT->close();
-         m_Sockets[*q]->m_TimeStamp = CTimer::getTime();
-         m_Sockets[*q]->m_Status = CLOSED;
-         m_ClosedSockets[*q] = m_Sockets[*q];
-         m_Sockets.erase(*q);
-      }
-
-      CGuard::leaveCS(i->second->m_AcceptLock);
-   }
-
-   // remove from peer rec
-   map<int64_t, set<UDTSOCKET> >::iterator j = m_PeerRec.find((i->second->m_PeerID << 30) + i->second->m_iISN);
-   if (j != m_PeerRec.end())
-   {
-      j->second.erase(u);
-      if (j->second.empty())
-         m_PeerRec.erase(j);
-   }
-
-   // delete this one
-   i->second->m_pUDT->close();
-   delete i->second;
-   m_ClosedSockets.erase(i);
-
-   map<int, CMultiplexer>::iterator m;
-   m = m_mMultiplexer.find(mid);
-   if (m == m_mMultiplexer.end())
-   {
-      //something is wrong!!!
-      return;
-   }
-
-   m->second.m_iRefCount --;
-   if (0 == m->second.m_iRefCount)
-   {
-      m->second.m_pChannel->close();
-      delete m->second.m_pSndQueue;
-      delete m->second.m_pRcvQueue;
-      delete m->second.m_pTimer;
-      delete m->second.m_pChannel;
-      m_mMultiplexer.erase(m);
-   }
-}
-
-void CUDTUnited::setError(CUDTException* e)
-{
-   #ifndef WIN32
-      delete (CUDTException*)pthread_getspecific(m_TLSError);
-      pthread_setspecific(m_TLSError, e);
-   #else
-      CGuard tg(m_TLSLock);
-      delete (CUDTException*)TlsGetValue(m_TLSError);
-      TlsSetValue(m_TLSError, e);
-      m_mTLSRecord[GetCurrentThreadId()] = e;
-   #endif
-}
-
-CUDTException* CUDTUnited::getError()
-{
-   #ifndef WIN32
-      if(NULL == pthread_getspecific(m_TLSError))
-         pthread_setspecific(m_TLSError, new CUDTException);
-      return (CUDTException*)pthread_getspecific(m_TLSError);
-   #else
-      CGuard tg(m_TLSLock);
-      if(NULL == TlsGetValue(m_TLSError))
-      {
-         CUDTException* e = new CUDTException;
-         TlsSetValue(m_TLSError, e);
-         m_mTLSRecord[GetCurrentThreadId()] = e;
-      }
-      return (CUDTException*)TlsGetValue(m_TLSError);
-   #endif
-}
-
-#ifdef WIN32
-void CUDTUnited::checkTLSValue()
-{
-   CGuard tg(m_TLSLock);
-
-   vector<DWORD> tbr;
-   for (map<DWORD, CUDTException*>::iterator i = m_mTLSRecord.begin(); i != m_mTLSRecord.end(); ++ i)
-   {
-      HANDLE h = OpenThread(THREAD_QUERY_INFORMATION, FALSE, i->first);
-      if (NULL == h)
-      {
-         tbr.push_back(i->first);
-         break;
-      }
-      if (WAIT_OBJECT_0 == WaitForSingleObject(h, 0))
-      {
-         delete i->second;
-         tbr.push_back(i->first);
-      }
-      CloseHandle(h);
-   }
-   for (vector<DWORD>::iterator j = tbr.begin(); j != tbr.end(); ++ j)
-      m_mTLSRecord.erase(*j);
-}
-#endif
-
-void CUDTUnited::updateMux(CUDTSocket* s, const sockaddr* addr, const UDPSOCKET* udpsock)
-{
-   CGuard cg(m_ControlLock);
-
-   if ((s->m_pUDT->m_bReuseAddr) && (NULL != addr))
-   {
-      int port = (AF_INET == s->m_pUDT->m_iIPversion) ? ntohs(((sockaddr_in*)addr)->sin_port) : ntohs(((sockaddr_in6*)addr)->sin6_port);
-
-      // find a reusable address
-      for (map<int, CMultiplexer>::iterator i = m_mMultiplexer.begin(); i != m_mMultiplexer.end(); ++ i)
-      {
-         if ((i->second.m_iIPversion == s->m_pUDT->m_iIPversion) && (i->second.m_iMSS == s->m_pUDT->m_iMSS) && i->second.m_bReusable)
-         {
-            if (i->second.m_iPort == port)
-            {
-               // reuse the existing multiplexer
-               ++ i->second.m_iRefCount;
-               s->m_pUDT->m_pSndQueue = i->second.m_pSndQueue;
-               s->m_pUDT->m_pRcvQueue = i->second.m_pRcvQueue;
-               s->m_iMuxID = i->second.m_iID;
-               return;
-            }
-         }
-      }
-   }
-
-   // a new multiplexer is needed
-   CMultiplexer m;
-   m.m_iMSS = s->m_pUDT->m_iMSS;
-   m.m_iIPversion = s->m_pUDT->m_iIPversion;
-   m.m_iRefCount = 1;
-   m.m_bReusable = s->m_pUDT->m_bReuseAddr;
-   m.m_iID = s->m_SocketID;
-
-   m.m_pChannel = new CChannel(s->m_pUDT->m_iIPversion);
-   m.m_pChannel->setSndBufSize(s->m_pUDT->m_iUDPSndBufSize);
-   m.m_pChannel->setRcvBufSize(s->m_pUDT->m_iUDPRcvBufSize);
-
-   try
-   {
-      if (NULL != udpsock)
-         m.m_pChannel->open(*udpsock);
-      else
-         m.m_pChannel->open(addr);
-   }
-   catch (CUDTException& e)
-   {
-      m.m_pChannel->close();
-      delete m.m_pChannel;
-      throw e;
-   }
-
-   sockaddr* sa = (AF_INET == s->m_pUDT->m_iIPversion) ? (sockaddr*) new sockaddr_in : (sockaddr*) new sockaddr_in6;
-   m.m_pChannel->getSockAddr(sa);
-   m.m_iPort = (AF_INET == s->m_pUDT->m_iIPversion) ? ntohs(((sockaddr_in*)sa)->sin_port) : ntohs(((sockaddr_in6*)sa)->sin6_port);
-   if (AF_INET == s->m_pUDT->m_iIPversion) delete (sockaddr_in*)sa; else delete (sockaddr_in6*)sa;
-
-   m.m_pTimer = new CTimer;
-
-   m.m_pSndQueue = new CSndQueue;
-   m.m_pSndQueue->init(m.m_pChannel, m.m_pTimer);
-   m.m_pRcvQueue = new CRcvQueue;
-   m.m_pRcvQueue->init(32, s->m_pUDT->m_iPayloadSize, m.m_iIPversion, 1024, m.m_pChannel, m.m_pTimer);
-
-   m_mMultiplexer[m.m_iID] = m;
-
-   s->m_pUDT->m_pSndQueue = m.m_pSndQueue;
-   s->m_pUDT->m_pRcvQueue = m.m_pRcvQueue;
-   s->m_iMuxID = m.m_iID;
-}
-
-void CUDTUnited::updateMux(CUDTSocket* s, const CUDTSocket* ls)
-{
-   CGuard cg(m_ControlLock);
-
-   int port = (AF_INET == ls->m_iIPversion) ? ntohs(((sockaddr_in*)ls->m_pSelfAddr)->sin_port) : ntohs(((sockaddr_in6*)ls->m_pSelfAddr)->sin6_port);
-
-   // find the listener's address
-   for (map<int, CMultiplexer>::iterator i = m_mMultiplexer.begin(); i != m_mMultiplexer.end(); ++ i)
-   {
-      if (i->second.m_iPort == port)
-      {
-         // reuse the existing multiplexer
-         ++ i->second.m_iRefCount;
-         s->m_pUDT->m_pSndQueue = i->second.m_pSndQueue;
-         s->m_pUDT->m_pRcvQueue = i->second.m_pRcvQueue;
-         s->m_iMuxID = i->second.m_iID;
-         return;
-      }
-   }
-}
-
-#ifndef WIN32
-   void* CUDTUnited::garbageCollect(void* p)
-#else
-   DWORD WINAPI CUDTUnited::garbageCollect(LPVOID p)
-#endif
-{
-   CUDTUnited* self = (CUDTUnited*)p;
-
-   CGuard gcguard(self->m_GCStopLock);
-
-   while (!self->m_bClosing)
-   {
-      self->checkBrokenSockets();
-
-      #ifdef WIN32
-         self->checkTLSValue();
-      #endif
-
-      #ifndef WIN32
-         timeval now;
-         timespec timeout;
-         gettimeofday(&now, 0);
-         timeout.tv_sec = now.tv_sec + 1;
-         timeout.tv_nsec = now.tv_usec * 1000;
-
-         pthread_cond_timedwait(&self->m_GCStopCond, &self->m_GCStopLock, &timeout);
-      #else
-         WaitForSingleObject(self->m_GCStopCond, 1000);
-      #endif
-   }
-
-   // remove all sockets and multiplexers
-   CGuard::enterCS(self->m_ControlLock);
-   for (map<UDTSOCKET, CUDTSocket*>::iterator i = self->m_Sockets.begin(); i != self->m_Sockets.end(); ++ i)
-   {
-      i->second->m_pUDT->m_bBroken = true;
-      i->second->m_pUDT->close();
-      i->second->m_Status = CLOSED;
-      i->second->m_TimeStamp = CTimer::getTime();
-      self->m_ClosedSockets[i->first] = i->second;
-
-      // remove from listener's queue
-      map<UDTSOCKET, CUDTSocket*>::iterator ls = self->m_Sockets.find(i->second->m_ListenSocket);
-      if (ls == self->m_Sockets.end())
-      {
-         ls = self->m_ClosedSockets.find(i->second->m_ListenSocket);
-         if (ls == self->m_ClosedSockets.end())
-            continue;
-      }
-
-      CGuard::enterCS(ls->second->m_AcceptLock);
-      ls->second->m_pQueuedSockets->erase(i->second->m_SocketID);
-      ls->second->m_pAcceptSockets->erase(i->second->m_SocketID);
-      CGuard::leaveCS(ls->second->m_AcceptLock);
-   }
-   self->m_Sockets.clear();
-
-   for (map<UDTSOCKET, CUDTSocket*>::iterator j = self->m_ClosedSockets.begin(); j != self->m_ClosedSockets.end(); ++ j)
-   {
-      j->second->m_TimeStamp = 0;
-   }
-   CGuard::leaveCS(self->m_ControlLock);
-
-   while (true)
-   {
-      self->checkBrokenSockets();
-
-      CGuard::enterCS(self->m_ControlLock);
-      bool empty = self->m_ClosedSockets.empty();
-      CGuard::leaveCS(self->m_ControlLock);
-
-      if (empty)
-         break;
-
-      CTimer::sleep();
-   }
-
-   #ifndef WIN32
-      return NULL;
-   #else
-      return 0;
-   #endif
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-int CUDT::startup()
-{
-   return s_UDTUnited.startup();
-}
-
-int CUDT::cleanup()
-{
-   return s_UDTUnited.cleanup();
-}
-
-UDTSOCKET CUDT::socket(int af, int type, int)
-{
-   if (!s_UDTUnited.m_bGCStatus)
-      s_UDTUnited.startup();
-
-   try
-   {
-      return s_UDTUnited.newSocket(af, type);
-   }
-   catch (CUDTException& e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return INVALID_SOCK;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return INVALID_SOCK;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return INVALID_SOCK;
-   }
-}
-
-int CUDT::bind(UDTSOCKET u, const sockaddr* name, int namelen)
-{
-   try
-   {
-      return s_UDTUnited.bind(u, name, namelen);
-   }
-   catch (CUDTException& e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::bind(UDTSOCKET u, UDPSOCKET udpsock)
-{
-   try
-   {
-      return s_UDTUnited.bind(u, udpsock);
-   }
-   catch (CUDTException& e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::listen(UDTSOCKET u, int backlog)
-{
-   try
-   {
-      return s_UDTUnited.listen(u, backlog);
-   }
-   catch (CUDTException& e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-UDTSOCKET CUDT::accept(UDTSOCKET u, sockaddr* addr, int* addrlen)
-{
-   try
-   {
-      return s_UDTUnited.accept(u, addr, addrlen);
-   }
-   catch (CUDTException& e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return INVALID_SOCK;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return INVALID_SOCK;
-   }
-}
-
-int CUDT::connect(UDTSOCKET u, const sockaddr* name, int namelen)
-{
-   try
-   {
-      return s_UDTUnited.connect(u, name, namelen);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::close(UDTSOCKET u)
-{
-   try
-   {
-      return s_UDTUnited.close(u);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::getpeername(UDTSOCKET u, sockaddr* name, int* namelen)
-{
-   try
-   {
-      return s_UDTUnited.getpeername(u, name, namelen);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::getsockname(UDTSOCKET u, sockaddr* name, int* namelen)
-{
-   try
-   {
-      return s_UDTUnited.getsockname(u, name, namelen);;
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::getsockopt(UDTSOCKET u, int, UDTOpt optname, void* optval, int* optlen)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      udt->getOpt(optname, optval, *optlen);
-      return 0;
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::setsockopt(UDTSOCKET u, int, UDTOpt optname, const void* optval, int optlen)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      udt->setOpt(optname, optval, optlen);
-      return 0;
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::send(UDTSOCKET u, const char* buf, int len, int)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      return udt->send(buf, len);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::recv(UDTSOCKET u, char* buf, int len, int)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      return udt->recv(buf, len);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::sendmsg(UDTSOCKET u, const char* buf, int len, int ttl, bool inorder)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      return udt->sendmsg(buf, len, ttl, inorder);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::recvmsg(UDTSOCKET u, char* buf, int len)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      return udt->recvmsg(buf, len);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int64_t CUDT::sendfile(UDTSOCKET u, fstream& ifs, int64_t& offset, int64_t size, int block)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      return udt->sendfile(ifs, offset, size, block);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int64_t CUDT::recvfile(UDTSOCKET u, fstream& ofs, int64_t& offset, int64_t size, int block)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      return udt->recvfile(ofs, offset, size, block);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::select(int, ud_set* readfds, ud_set* writefds, ud_set* exceptfds, const timeval* timeout)
-{
-   if ((NULL == readfds) && (NULL == writefds) && (NULL == exceptfds))
-   {
-      s_UDTUnited.setError(new CUDTException(5, 3, 0));
-      return ERROR;
-   }
-
-   try
-   {
-      return s_UDTUnited.select(readfds, writefds, exceptfds, timeout);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::selectEx(const vector<UDTSOCKET>& fds, vector<UDTSOCKET>* readfds, vector<UDTSOCKET>* writefds, vector<UDTSOCKET>* exceptfds, int64_t msTimeOut)
-{
-   if ((NULL == readfds) && (NULL == writefds) && (NULL == exceptfds))
-   {
-      s_UDTUnited.setError(new CUDTException(5, 3, 0));
-      return ERROR;
-   }
-
-   try
-   {
-      return s_UDTUnited.selectEx(fds, readfds, writefds, exceptfds, msTimeOut);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (bad_alloc&)
-   {
-      s_UDTUnited.setError(new CUDTException(3, 2, 0));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::epoll_create()
-{
-   try
-   {
-      return s_UDTUnited.epoll_create();
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::epoll_add_usock(const int eid, const UDTSOCKET u, const int* events)
-{
-   try
-   {
-      return s_UDTUnited.epoll_add_usock(eid, u, events);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::epoll_add_ssock(const int eid, const SYSSOCKET s, const int* events)
-{
-   try
-   {
-      return s_UDTUnited.epoll_add_ssock(eid, s, events);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::epoll_remove_usock(const int eid, const UDTSOCKET u)
-{
-   try
-   {
-      return s_UDTUnited.epoll_remove_usock(eid, u);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::epoll_remove_ssock(const int eid, const SYSSOCKET s)
-{
-   try
-   {
-      return s_UDTUnited.epoll_remove_ssock(eid, s);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::epoll_wait(const int eid, set<UDTSOCKET>* readfds, set<UDTSOCKET>* writefds, int64_t msTimeOut, set<SYSSOCKET>* lrfds, set<SYSSOCKET>* lwfds)
-{
-   try
-   {
-      return s_UDTUnited.epoll_wait(eid, readfds, writefds, msTimeOut, lrfds, lwfds);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-int CUDT::epoll_release(const int eid)
-{
-   try
-   {
-      return s_UDTUnited.epoll_release(eid);
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-CUDTException& CUDT::getlasterror()
-{
-   return *s_UDTUnited.getError();
-}
-
-int CUDT::perfmon(UDTSOCKET u, CPerfMon* perf, bool clear)
-{
-   try
-   {
-      CUDT* udt = s_UDTUnited.lookup(u);
-      udt->sample(perf, clear);
-      return 0;
-   }
-   catch (CUDTException e)
-   {
-      s_UDTUnited.setError(new CUDTException(e));
-      return ERROR;
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return ERROR;
-   }
-}
-
-CUDT* CUDT::getUDTHandle(UDTSOCKET u)
-{
-   try
-   {
-      return s_UDTUnited.lookup(u);
-   }
-   catch (...)
-   {
-      return NULL;
-   }
-}
-
-UDTSTATUS CUDT::getsockstate(UDTSOCKET u)
-{
-   try
-   {
-      return s_UDTUnited.getStatus(u);
-   }
-   catch (...)
-   {
-      s_UDTUnited.setError(new CUDTException(-1, 0, 0));
-      return NONEXIST;
-   }
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-namespace UDT
-{
-
-int startup()
-{
-   return CUDT::startup();
-}
-
-int cleanup()
-{
-   return CUDT::cleanup();
-}
-
-UDTSOCKET socket(int af, int type, int protocol)
-{
-   return CUDT::socket(af, type, protocol);
-}
-
-int bind(UDTSOCKET u, const struct sockaddr* name, int namelen)
-{
-   return CUDT::bind(u, name, namelen);
-}
-
-int bind2(UDTSOCKET u, UDPSOCKET udpsock)
-{
-   return CUDT::bind(u, udpsock);
-}
-
-int listen(UDTSOCKET u, int backlog)
-{
-   return CUDT::listen(u, backlog);
-}
-
-UDTSOCKET accept(UDTSOCKET u, struct sockaddr* addr, int* addrlen)
-{
-   return CUDT::accept(u, addr, addrlen);
-}
-
-int connect(UDTSOCKET u, const struct sockaddr* name, int namelen)
-{
-   return CUDT::connect(u, name, namelen);
-}
-
-int close(UDTSOCKET u)
-{
-   return CUDT::close(u);
-}
-
-int getpeername(UDTSOCKET u, struct sockaddr* name, int* namelen)
-{
-   return CUDT::getpeername(u, name, namelen);
-}
-
-int getsockname(UDTSOCKET u, struct sockaddr* name, int* namelen)
-{
-   return CUDT::getsockname(u, name, namelen);
-}
-
-int getsockopt(UDTSOCKET u, int level, SOCKOPT optname, void* optval, int* optlen)
-{
-   return CUDT::getsockopt(u, level, optname, optval, optlen);
-}
-
-int setsockopt(UDTSOCKET u, int level, SOCKOPT optname, const void* optval, int optlen)
-{
-   return CUDT::setsockopt(u, level, optname, optval, optlen);
-}
-
-int send(UDTSOCKET u, const char* buf, int len, int flags)
-{
-   return CUDT::send(u, buf, len, flags);
-}
-
-int recv(UDTSOCKET u, char* buf, int len, int flags)
-{
-   return CUDT::recv(u, buf, len, flags);
-}
-
-int sendmsg(UDTSOCKET u, const char* buf, int len, int ttl, bool inorder)
-{
-   return CUDT::sendmsg(u, buf, len, ttl, inorder);
-}
-
-int recvmsg(UDTSOCKET u, char* buf, int len)
-{
-   return CUDT::recvmsg(u, buf, len);
-}
-
-int64_t sendfile(UDTSOCKET u, fstream& ifs, int64_t& offset, int64_t size, int block)
-{
-   return CUDT::sendfile(u, ifs, offset, size, block);
-}
-
-int64_t recvfile(UDTSOCKET u, fstream& ofs, int64_t& offset, int64_t size, int block)
-{
-   return CUDT::recvfile(u, ofs, offset, size, block);
-}
-
-int64_t sendfile2(UDTSOCKET u, const char* path, int64_t* offset, int64_t size, int block)
-{
-   fstream ifs(path, ios::binary | ios::in);
-   int64_t ret = CUDT::sendfile(u, ifs, *offset, size, block);
-   ifs.close();
-   return ret;
-}
-
-int64_t recvfile2(UDTSOCKET u, const char* path, int64_t* offset, int64_t size, int block)
-{
-   fstream ofs(path, ios::binary | ios::out);
-   int64_t ret = CUDT::recvfile(u, ofs, *offset, size, block);
-   ofs.close();
-   return ret;
-}
-
-int select(int nfds, UDSET* readfds, UDSET* writefds, UDSET* exceptfds, const struct timeval* timeout)
-{
-   return CUDT::select(nfds, readfds, writefds, exceptfds, timeout);
-}
-
-int selectEx(const vector<UDTSOCKET>& fds, vector<UDTSOCKET>* readfds, vector<UDTSOCKET>* writefds, vector<UDTSOCKET>* exceptfds, int64_t msTimeOut)
-{
-   return CUDT::selectEx(fds, readfds, writefds, exceptfds, msTimeOut);
-}
-
-int epoll_create()
-{
-   return CUDT::epoll_create();
-}
-
-int epoll_add_usock(int eid, UDTSOCKET u, const int* events)
-{
-   return CUDT::epoll_add_usock(eid, u, events);
-}
-
-int epoll_add_ssock(int eid, SYSSOCKET s, const int* events)
-{
-   return CUDT::epoll_add_ssock(eid, s, events);
-}
-
-int epoll_remove_usock(int eid, UDTSOCKET u)
-{
-   return CUDT::epoll_remove_usock(eid, u);
-}
-
-int epoll_remove_ssock(int eid, SYSSOCKET s)
-{
-   return CUDT::epoll_remove_ssock(eid, s);
-}
-
-int epoll_wait(int eid, set<UDTSOCKET>* readfds, set<UDTSOCKET>* writefds, int64_t msTimeOut, set<SYSSOCKET>* lrfds, set<SYSSOCKET>* lwfds)
-{
-   return CUDT::epoll_wait(eid, readfds, writefds, msTimeOut, lrfds, lwfds);
-}
-
-#define SET_RESULT(val, num, fds, it) \
-   if ((val != NULL) && !val->empty()) \
-   { \
-      if (*num > static_cast<int>(val->size())) \
-         *num = val->size(); \
-      int count = 0; \
-      for (it = val->begin(); it != val->end(); ++ it) \
-      { \
-         if (count >= *num) \
-            break; \
-         fds[count ++] = *it; \
-      } \
-   }
-int epoll_wait2(int eid, UDTSOCKET* readfds, int* rnum, UDTSOCKET* writefds, int* wnum, int64_t msTimeOut,
-                SYSSOCKET* lrfds, int* lrnum, SYSSOCKET* lwfds, int* lwnum)
-{
-   // This API is an alternative format for epoll_wait, created for compatability with other languages.
-   // Users need to pass in an array for holding the returned sockets, with the maximum array length
-   // stored in *rnum, etc., which will be updated with returned number of sockets.
-
-   set<UDTSOCKET> readset;
-   set<UDTSOCKET> writeset;
-   set<SYSSOCKET> lrset;
-   set<SYSSOCKET> lwset;
-   set<UDTSOCKET>* rval = NULL;
-   set<UDTSOCKET>* wval = NULL;
-   set<SYSSOCKET>* lrval = NULL;
-   set<SYSSOCKET>* lwval = NULL;
-   if ((readfds != NULL) && (rnum != NULL))
-      rval = &readset;
-   if ((writefds != NULL) && (wnum != NULL))
-      wval = &writeset;
-   if ((lrfds != NULL) && (lrnum != NULL))
-      lrval = &lrset;
-   if ((lwfds != NULL) && (lwnum != NULL))
-      lwval = &lwset;
-
-   int ret = CUDT::epoll_wait(eid, rval, wval, msTimeOut, lrval, lwval);
-   if (ret > 0)
-   {
-      set<UDTSOCKET>::const_iterator i;
-      SET_RESULT(rval, rnum, readfds, i);
-      SET_RESULT(wval, wnum, writefds, i);
-      set<SYSSOCKET>::const_iterator j;
-      SET_RESULT(lrval, lrnum, lrfds, j);
-      SET_RESULT(lwval, lwnum, lwfds, j);
-   }
-   return ret;
-}
-
-int epoll_release(int eid)
-{
-   return CUDT::epoll_release(eid);
-}
-
-ERRORINFO& getlasterror()
-{
-   return CUDT::getlasterror();
-}
-
-int getlasterror_code()
-{
-   return CUDT::getlasterror().getErrorCode();
-}
-
-const char* getlasterror_desc()
-{
-   return CUDT::getlasterror().getErrorMessage();
-}
-
-int perfmon(UDTSOCKET u, TRACEINFO* perf, bool clear)
-{
-   return CUDT::perfmon(u, perf, clear);
-}
-
-UDTSTATUS getsockstate(UDTSOCKET u)
-{
-   return CUDT::getsockstate(u);
-}
-
-}  // namespace UDT
diff --git a/vendor/udt4/src/api.h b/vendor/udt4/src/api.h
deleted file mode 100644
index 24f1a02..0000000
--- a/vendor/udt4/src/api.h
+++ /dev/null
@@ -1,268 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2010, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 09/28/2010
-*****************************************************************************/
-
-#ifndef __UDT_API_H__
-#define __UDT_API_H__
-
-
-#include <map>
-#include <vector>
-#include "udt.h"
-#include "packet.h"
-#include "queue.h"
-#include "cache.h"
-#include "epoll.h"
-
-class CUDT;
-
-class CUDTSocket
-{
-public:
-   CUDTSocket();
-   ~CUDTSocket();
-
-   UDTSTATUS m_Status;                       // current socket state
-
-   uint64_t m_TimeStamp;                     // time when the socket is closed
-
-   int m_iIPversion;                         // IP version
-   sockaddr* m_pSelfAddr;                    // pointer to the local address of the socket
-   sockaddr* m_pPeerAddr;                    // pointer to the peer address of the socket
-
-   UDTSOCKET m_SocketID;                     // socket ID
-   UDTSOCKET m_ListenSocket;                 // ID of the listener socket; 0 means this is an independent socket
-
-   UDTSOCKET m_PeerID;                       // peer socket ID
-   int32_t m_iISN;                           // initial sequence number, used to tell different connection from same IP:port
-
-   CUDT* m_pUDT;                             // pointer to the UDT entity
-
-   std::set<UDTSOCKET>* m_pQueuedSockets;    // set of connections waiting for accept()
-   std::set<UDTSOCKET>* m_pAcceptSockets;    // set of accept()ed connections
-
-   pthread_cond_t m_AcceptCond;              // used to block "accept" call
-   pthread_mutex_t m_AcceptLock;             // mutex associated to m_AcceptCond
-
-   unsigned int m_uiBackLog;                 // maximum number of connections in queue
-
-   int m_iMuxID;                             // multiplexer ID
-
-   pthread_mutex_t m_ControlLock;            // lock this socket exclusively for control APIs: bind/listen/connect
-
-private:
-   CUDTSocket(const CUDTSocket&);
-   CUDTSocket& operator=(const CUDTSocket&);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class CUDTUnited
-{
-friend class CUDT;
-friend class CRendezvousQueue;
-
-public:
-   CUDTUnited();
-   ~CUDTUnited();
-
-public:
-
-      // Functionality:
-      //    initialize the UDT library.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    0 if success, otherwise -1 is returned.
-
-   int startup();
-
-      // Functionality:
-      //    release the UDT library.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    0 if success, otherwise -1 is returned.
-
-   int cleanup();
-
-      // Functionality:
-      //    Create a new UDT socket.
-      // Parameters:
-      //    0) [in] af: IP version, IPv4 (AF_INET) or IPv6 (AF_INET6).
-      //    1) [in] type: socket type, SOCK_STREAM or SOCK_DGRAM
-      // Returned value:
-      //    The new UDT socket ID, or INVALID_SOCK.
-
-   UDTSOCKET newSocket(int af, int type);
-
-      // Functionality:
-      //    Create a new UDT connection.
-      // Parameters:
-      //    0) [in] listen: the listening UDT socket;
-      //    1) [in] peer: peer address.
-      //    2) [in/out] hs: handshake information from peer side (in), negotiated value (out);
-      // Returned value:
-      //    If the new connection is successfully created: 1 success, 0 already exist, -1 error.
-
-   int newConnection(const UDTSOCKET listen, const sockaddr* peer, CHandShake* hs);
-
-      // Functionality:
-      //    look up the UDT entity according to its ID.
-      // Parameters:
-      //    0) [in] u: the UDT socket ID.
-      // Returned value:
-      //    Pointer to the UDT entity.
-
-   CUDT* lookup(const UDTSOCKET u);
-
-      // Functionality:
-      //    Check the status of the UDT socket.
-      // Parameters:
-      //    0) [in] u: the UDT socket ID.
-      // Returned value:
-      //    UDT socket status, or NONEXIST if not found.
-
-   UDTSTATUS getStatus(const UDTSOCKET u);
-
-      // socket APIs
-
-   int bind(const UDTSOCKET u, const sockaddr* name, int namelen);
-   int bind(const UDTSOCKET u, UDPSOCKET udpsock);
-   int listen(const UDTSOCKET u, int backlog);
-   UDTSOCKET accept(const UDTSOCKET listen, sockaddr* addr, int* addrlen);
-   int connect(const UDTSOCKET u, const sockaddr* name, int namelen);
-   int close(const UDTSOCKET u);
-   int getpeername(const UDTSOCKET u, sockaddr* name, int* namelen);
-   int getsockname(const UDTSOCKET u, sockaddr* name, int* namelen);
-   int select(ud_set* readfds, ud_set* writefds, ud_set* exceptfds, const timeval* timeout);
-   int selectEx(const std::vector<UDTSOCKET>& fds, std::vector<UDTSOCKET>* readfds, std::vector<UDTSOCKET>* writefds, std::vector<UDTSOCKET>* exceptfds, int64_t msTimeOut);
-   int epoll_create();
-   int epoll_add_usock(const int eid, const UDTSOCKET u, const int* events = NULL);
-   int epoll_add_ssock(const int eid, const SYSSOCKET s, const int* events = NULL);
-   int epoll_remove_usock(const int eid, const UDTSOCKET u);
-   int epoll_remove_ssock(const int eid, const SYSSOCKET s);
-   int epoll_wait(const int eid, std::set<UDTSOCKET>* readfds, std::set<UDTSOCKET>* writefds, int64_t msTimeOut, std::set<SYSSOCKET>* lrfds = NULL, std::set<SYSSOCKET>* lwfds = NULL);
-   int epoll_release(const int eid);
-
-      // Functionality:
-      //    record the UDT exception.
-      // Parameters:
-      //    0) [in] e: pointer to a UDT exception instance.
-      // Returned value:
-      //    None.
-
-   void setError(CUDTException* e);
-
-      // Functionality:
-      //    look up the most recent UDT exception.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    pointer to a UDT exception instance.
-
-   CUDTException* getError();
-
-private:
-//   void init();
-
-private:
-   std::map<UDTSOCKET, CUDTSocket*> m_Sockets;       // stores all the socket structures
-
-   pthread_mutex_t m_ControlLock;                    // used to synchronize UDT API
-
-   pthread_mutex_t m_IDLock;                         // used to synchronize ID generation
-   UDTSOCKET m_SocketID;                             // seed to generate a new unique socket ID
-
-   std::map<int64_t, std::set<UDTSOCKET> > m_PeerRec;// record sockets from peers to avoid repeated connection request, int64_t = (socker_id << 30) + isn
-
-private:
-   pthread_key_t m_TLSError;                         // thread local error record (last error)
-   #ifndef WIN32
-      static void TLSDestroy(void* e) {if (NULL != e) delete (CUDTException*)e;}
-   #else
-      std::map<DWORD, CUDTException*> m_mTLSRecord;
-      void checkTLSValue();
-      pthread_mutex_t m_TLSLock;
-   #endif
-
-private:
-   void connect_complete(const UDTSOCKET u);
-   CUDTSocket* locate(const UDTSOCKET u);
-   CUDTSocket* locate(const sockaddr* peer, const UDTSOCKET id, int32_t isn);
-   void updateMux(CUDTSocket* s, const sockaddr* addr = NULL, const UDPSOCKET* = NULL);
-   void updateMux(CUDTSocket* s, const CUDTSocket* ls);
-
-private:
-   std::map<int, CMultiplexer> m_mMultiplexer;		// UDP multiplexer
-   pthread_mutex_t m_MultiplexerLock;
-
-private:
-   CCache<CInfoBlock>* m_pCache;			// UDT network information cache
-
-private:
-   volatile bool m_bClosing;
-   pthread_mutex_t m_GCStopLock;
-   pthread_cond_t m_GCStopCond;
-
-   pthread_mutex_t m_InitLock;
-   int m_iInstanceCount;				// number of startup() called by application
-   bool m_bGCStatus;					// if the GC thread is working (true)
-
-   pthread_t m_GCThread;
-   #ifndef WIN32
-      static void* garbageCollect(void*);
-   #else
-      static DWORD WINAPI garbageCollect(LPVOID);
-   #endif
-
-   std::map<UDTSOCKET, CUDTSocket*> m_ClosedSockets;   // temporarily store closed sockets
-
-   void checkBrokenSockets();
-   void removeSocket(const UDTSOCKET u);
-
-private:
-   CEPoll m_EPoll;                                     // handling epoll data structures and events
-
-private:
-   CUDTUnited(const CUDTUnited&);
-   CUDTUnited& operator=(const CUDTUnited&);
-};
-
-#endif
diff --git a/vendor/udt4/src/buffer.cpp b/vendor/udt4/src/buffer.cpp
deleted file mode 100644
index 327ab76..0000000
--- a/vendor/udt4/src/buffer.cpp
+++ /dev/null
@@ -1,652 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 03/12/2011
-*****************************************************************************/
-
-#include <cstring>
-#include <cmath>
-#include "buffer.h"
-
-using namespace std;
-
-CSndBuffer::CSndBuffer(int size, int mss):
-m_BufLock(),
-m_pBlock(NULL),
-m_pFirstBlock(NULL),
-m_pCurrBlock(NULL),
-m_pLastBlock(NULL),
-m_pBuffer(NULL),
-m_iNextMsgNo(1),
-m_iSize(size),
-m_iMSS(mss),
-m_iCount(0)
-{
-   // initial physical buffer of "size"
-   m_pBuffer = new Buffer;
-   m_pBuffer->m_pcData = new char [m_iSize * m_iMSS];
-   m_pBuffer->m_iSize = m_iSize;
-   m_pBuffer->m_pNext = NULL;
-
-   // circular linked list for out bound packets
-   m_pBlock = new Block;
-   Block* pb = m_pBlock;
-   for (int i = 1; i < m_iSize; ++ i)
-   {
-      pb->m_pNext = new Block;
-      pb->m_iMsgNo = 0;
-      pb = pb->m_pNext;
-   }
-   pb->m_pNext = m_pBlock;
-
-   pb = m_pBlock;
-   char* pc = m_pBuffer->m_pcData;
-   for (int i = 0; i < m_iSize; ++ i)
-   {
-      pb->m_pcData = pc;
-      pb = pb->m_pNext;
-      pc += m_iMSS;
-   }
-
-   m_pFirstBlock = m_pCurrBlock = m_pLastBlock = m_pBlock;
-
-   #ifndef WIN32
-      pthread_mutex_init(&m_BufLock, NULL);
-   #else
-      m_BufLock = CreateMutex(NULL, false, NULL);
-   #endif
-}
-
-CSndBuffer::~CSndBuffer()
-{
-   Block* pb = m_pBlock->m_pNext;
-   while (pb != m_pBlock)
-   {
-      Block* temp = pb;
-      pb = pb->m_pNext;
-      delete temp;
-   }
-   delete m_pBlock;
-
-   while (m_pBuffer != NULL)
-   {
-      Buffer* temp = m_pBuffer;
-      m_pBuffer = m_pBuffer->m_pNext;
-      delete [] temp->m_pcData;
-      delete temp;
-   }
-
-   #ifndef WIN32
-      pthread_mutex_destroy(&m_BufLock);
-   #else
-      CloseHandle(m_BufLock);
-   #endif
-}
-
-void CSndBuffer::addBuffer(const char* data, int len, int ttl, bool order)
-{
-   int size = len / m_iMSS;
-   if ((len % m_iMSS) != 0)
-      size ++;
-
-   // dynamically increase sender buffer
-   while (size + m_iCount >= m_iSize)
-      increase();
-
-   uint64_t time = CTimer::getTime();
-   int32_t inorder = order;
-   inorder <<= 29;
-
-   Block* s = m_pLastBlock;
-   for (int i = 0; i < size; ++ i)
-   {
-      int pktlen = len - i * m_iMSS;
-      if (pktlen > m_iMSS)
-         pktlen = m_iMSS;
-
-      memcpy(s->m_pcData, data + i * m_iMSS, pktlen);
-      s->m_iLength = pktlen;
-
-      s->m_iMsgNo = m_iNextMsgNo | inorder;
-      if (i == 0)
-         s->m_iMsgNo |= 0x80000000;
-      if (i == size - 1)
-         s->m_iMsgNo |= 0x40000000;
-
-      s->m_OriginTime = time;
-      s->m_iTTL = ttl;
-
-      s = s->m_pNext;
-   }
-   m_pLastBlock = s;
-
-   CGuard::enterCS(m_BufLock);
-   m_iCount += size;
-   CGuard::leaveCS(m_BufLock);
-
-   m_iNextMsgNo ++;
-   if (m_iNextMsgNo == CMsgNo::m_iMaxMsgNo)
-      m_iNextMsgNo = 1;
-}
-
-int CSndBuffer::addBufferFromFile(fstream& ifs, int len)
-{
-   int size = len / m_iMSS;
-   if ((len % m_iMSS) != 0)
-      size ++;
-
-   // dynamically increase sender buffer
-   while (size + m_iCount >= m_iSize)
-      increase();
-
-   Block* s = m_pLastBlock;
-   int total = 0;
-   for (int i = 0; i < size; ++ i)
-   {
-      if (ifs.bad() || ifs.fail() || ifs.eof())
-         break;
-
-      int pktlen = len - i * m_iMSS;
-      if (pktlen > m_iMSS)
-         pktlen = m_iMSS;
-
-      ifs.read(s->m_pcData, pktlen);
-      if ((pktlen = ifs.gcount()) <= 0)
-         break;
-
-      // currently file transfer is only available in streaming mode, message is always in order, ttl = infinite
-      s->m_iMsgNo = m_iNextMsgNo | 0x20000000;
-      if (i == 0)
-         s->m_iMsgNo |= 0x80000000;
-      if (i == size - 1)
-         s->m_iMsgNo |= 0x40000000;
-
-      s->m_iLength = pktlen;
-      s->m_iTTL = -1;
-      s = s->m_pNext;
-
-      total += pktlen;
-   }
-   m_pLastBlock = s;
-
-   CGuard::enterCS(m_BufLock);
-   m_iCount += size;
-   CGuard::leaveCS(m_BufLock);
-
-   m_iNextMsgNo ++;
-   if (m_iNextMsgNo == CMsgNo::m_iMaxMsgNo)
-      m_iNextMsgNo = 1;
-
-   return total;
-}
-
-int CSndBuffer::readData(char** data, int32_t& msgno)
-{
-   // No data to read
-   if (m_pCurrBlock == m_pLastBlock)
-      return 0;
-
-   *data = m_pCurrBlock->m_pcData;
-   int readlen = m_pCurrBlock->m_iLength;
-   msgno = m_pCurrBlock->m_iMsgNo;
-
-   m_pCurrBlock = m_pCurrBlock->m_pNext;
-
-   return readlen;
-}
-
-int CSndBuffer::readData(char** data, const int offset, int32_t& msgno, int& msglen)
-{
-   CGuard bufferguard(m_BufLock);
-
-   Block* p = m_pFirstBlock;
-
-   for (int i = 0; i < offset; ++ i)
-      p = p->m_pNext;
-
-   if ((p->m_iTTL >= 0) && ((CTimer::getTime() - p->m_OriginTime) / 1000 > (uint64_t)p->m_iTTL))
-   {
-      msgno = p->m_iMsgNo & 0x1FFFFFFF;
-
-      msglen = 1;
-      p = p->m_pNext;
-      bool move = false;
-      while (msgno == (p->m_iMsgNo & 0x1FFFFFFF))
-      {
-         if (p == m_pCurrBlock)
-            move = true;
-         p = p->m_pNext;
-         if (move)
-            m_pCurrBlock = p;
-         msglen ++;
-      }
-
-      return -1;
-   }
-
-   *data = p->m_pcData;
-   int readlen = p->m_iLength;
-   msgno = p->m_iMsgNo;
-
-   return readlen;
-}
-
-void CSndBuffer::ackData(int offset)
-{
-   CGuard bufferguard(m_BufLock);
-
-   for (int i = 0; i < offset; ++ i)
-      m_pFirstBlock = m_pFirstBlock->m_pNext;
-
-   m_iCount -= offset;
-
-   CTimer::triggerEvent();
-}
-
-int CSndBuffer::getCurrBufSize() const
-{
-   return m_iCount;
-}
-
-void CSndBuffer::increase()
-{
-   int unitsize = m_pBuffer->m_iSize;
-
-   // new physical buffer
-   Buffer* nbuf = NULL;
-   try
-   {
-      nbuf  = new Buffer;
-      nbuf->m_pcData = new char [unitsize * m_iMSS];
-   }
-   catch (...)
-   {
-      delete nbuf;
-      throw CUDTException(3, 2, 0);
-   }
-   nbuf->m_iSize = unitsize;
-   nbuf->m_pNext = NULL;
-
-   // insert the buffer at the end of the buffer list
-   Buffer* p = m_pBuffer;
-   while (NULL != p->m_pNext)
-      p = p->m_pNext;
-   p->m_pNext = nbuf;
-
-   // new packet blocks
-   Block* nblk = NULL;
-   try
-   {
-      nblk = new Block;
-   }
-   catch (...)
-   {
-      delete nblk;
-      throw CUDTException(3, 2, 0);
-   }
-   Block* pb = nblk;
-   for (int i = 1; i < unitsize; ++ i)
-   {
-      pb->m_pNext = new Block;
-      pb = pb->m_pNext;
-   }
-
-   // insert the new blocks onto the existing one
-   pb->m_pNext = m_pLastBlock->m_pNext;
-   m_pLastBlock->m_pNext = nblk;
-
-   pb = nblk;
-   char* pc = nbuf->m_pcData;
-   for (int i = 0; i < unitsize; ++ i)
-   {
-      pb->m_pcData = pc;
-      pb = pb->m_pNext;
-      pc += m_iMSS;
-   }
-
-   m_iSize += unitsize;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-CRcvBuffer::CRcvBuffer(CUnitQueue* queue, int bufsize):
-m_pUnit(NULL),
-m_iSize(bufsize),
-m_pUnitQueue(queue),
-m_iStartPos(0),
-m_iLastAckPos(0),
-m_iMaxPos(0),
-m_iNotch(0)
-{
-   m_pUnit = new CUnit* [m_iSize];
-   for (int i = 0; i < m_iSize; ++ i)
-      m_pUnit[i] = NULL;
-}
-
-CRcvBuffer::~CRcvBuffer()
-{
-   for (int i = 0; i < m_iSize; ++ i)
-   {
-      if (NULL != m_pUnit[i])
-      {
-         m_pUnit[i]->m_iFlag = 0;
-         -- m_pUnitQueue->m_iCount;
-      }
-   }
-
-   delete [] m_pUnit;
-}
-
-int CRcvBuffer::addData(CUnit* unit, int offset)
-{
-   int pos = (m_iLastAckPos + offset) % m_iSize;
-   if (offset > m_iMaxPos)
-      m_iMaxPos = offset;
-
-   if (NULL != m_pUnit[pos])
-      return -1;
-   
-   m_pUnit[pos] = unit;
-
-   unit->m_iFlag = 1;
-   ++ m_pUnitQueue->m_iCount;
-
-   return 0;
-}
-
-int CRcvBuffer::readBuffer(char* data, int len)
-{
-   int p = m_iStartPos;
-   int lastack = m_iLastAckPos;
-   int rs = len;
-
-   while ((p != lastack) && (rs > 0))
-   {
-      int unitsize = m_pUnit[p]->m_Packet.getLength() - m_iNotch;
-      if (unitsize > rs)
-         unitsize = rs;
-
-      memcpy(data, m_pUnit[p]->m_Packet.m_pcData + m_iNotch, unitsize);
-      data += unitsize;
-
-      if ((rs > unitsize) || (rs == m_pUnit[p]->m_Packet.getLength() - m_iNotch))
-      {
-         CUnit* tmp = m_pUnit[p];
-         m_pUnit[p] = NULL;
-         tmp->m_iFlag = 0;
-         -- m_pUnitQueue->m_iCount;
-
-         if (++ p == m_iSize)
-            p = 0;
-
-         m_iNotch = 0;
-      }
-      else
-         m_iNotch += rs;
-
-      rs -= unitsize;
-   }
-
-   m_iStartPos = p;
-   return len - rs;
-}
-
-int CRcvBuffer::readBufferToFile(fstream& ofs, int len)
-{
-   int p = m_iStartPos;
-   int lastack = m_iLastAckPos;
-   int rs = len;
-
-   while ((p != lastack) && (rs > 0))
-   {
-      int unitsize = m_pUnit[p]->m_Packet.getLength() - m_iNotch;
-      if (unitsize > rs)
-         unitsize = rs;
-
-      ofs.write(m_pUnit[p]->m_Packet.m_pcData + m_iNotch, unitsize);
-      if (ofs.fail())
-         break;
-
-      if ((rs > unitsize) || (rs == m_pUnit[p]->m_Packet.getLength() - m_iNotch))
-      {
-         CUnit* tmp = m_pUnit[p];
-         m_pUnit[p] = NULL;
-         tmp->m_iFlag = 0;
-         -- m_pUnitQueue->m_iCount;
-
-         if (++ p == m_iSize)
-            p = 0;
-
-         m_iNotch = 0;
-      }
-      else
-         m_iNotch += rs;
-
-      rs -= unitsize;
-   }
-
-   m_iStartPos = p;
-
-   return len - rs;
-}
-
-void CRcvBuffer::ackData(int len)
-{
-   m_iLastAckPos = (m_iLastAckPos + len) % m_iSize;
-   m_iMaxPos -= len;
-   if (m_iMaxPos < 0)
-      m_iMaxPos = 0;
-
-   CTimer::triggerEvent();
-}
-
-int CRcvBuffer::getAvailBufSize() const
-{
-   // One slot must be empty in order to tell the difference between "empty buffer" and "full buffer"
-   return m_iSize - getRcvDataSize() - 1;
-}
-
-int CRcvBuffer::getRcvDataSize() const
-{
-   if (m_iLastAckPos >= m_iStartPos)
-      return m_iLastAckPos - m_iStartPos;
-
-   return m_iSize + m_iLastAckPos - m_iStartPos;
-}
-
-void CRcvBuffer::dropMsg(int32_t msgno)
-{
-   for (int i = m_iStartPos, n = (m_iLastAckPos + m_iMaxPos) % m_iSize; i != n; i = (i + 1) % m_iSize)
-      if ((NULL != m_pUnit[i]) && (msgno == m_pUnit[i]->m_Packet.m_iMsgNo))
-         m_pUnit[i]->m_iFlag = 3;
-}
-
-int CRcvBuffer::readMsg(char* data, int len)
-{
-   int p, q;
-   bool passack;
-   if (!scanMsg(p, q, passack))
-      return 0;
-
-   int rs = len;
-   while (p != (q + 1) % m_iSize)
-   {
-      int unitsize = m_pUnit[p]->m_Packet.getLength();
-      if ((rs >= 0) && (unitsize > rs))
-         unitsize = rs;
-
-      if (unitsize > 0)
-      {
-         memcpy(data, m_pUnit[p]->m_Packet.m_pcData, unitsize);
-         data += unitsize;
-         rs -= unitsize;
-      }
-
-      if (!passack)
-      {
-         CUnit* tmp = m_pUnit[p];
-         m_pUnit[p] = NULL;
-         tmp->m_iFlag = 0;
-         -- m_pUnitQueue->m_iCount;
-      }
-      else
-         m_pUnit[p]->m_iFlag = 2;
-
-      if (++ p == m_iSize)
-         p = 0;
-   }
-
-   if (!passack)
-      m_iStartPos = (q + 1) % m_iSize;
-
-   return len - rs;
-}
-
-int CRcvBuffer::getRcvMsgNum()
-{
-   int p, q;
-   bool passack;
-   return scanMsg(p, q, passack) ? 1 : 0;
-}
-
-bool CRcvBuffer::scanMsg(int& p, int& q, bool& passack)
-{
-   // empty buffer
-   if ((m_iStartPos == m_iLastAckPos) && (m_iMaxPos <= 0))
-      return false;
-
-   //skip all bad msgs at the beginning
-   while (m_iStartPos != m_iLastAckPos)
-   {
-      if (NULL == m_pUnit[m_iStartPos])
-      {
-         if (++ m_iStartPos == m_iSize)
-            m_iStartPos = 0;
-         continue;
-      }
-
-      if ((1 == m_pUnit[m_iStartPos]->m_iFlag) && (m_pUnit[m_iStartPos]->m_Packet.getMsgBoundary() > 1))
-      {
-         bool good = true;
-
-         // look ahead for the whole message
-         for (int i = m_iStartPos; i != m_iLastAckPos;)
-         {
-            if ((NULL == m_pUnit[i]) || (1 != m_pUnit[i]->m_iFlag))
-            {
-               good = false;
-               break;
-            }
-
-            if ((m_pUnit[i]->m_Packet.getMsgBoundary() == 1) || (m_pUnit[i]->m_Packet.getMsgBoundary() == 3))
-               break;
-
-            if (++ i == m_iSize)
-               i = 0;
-         }
-
-         if (good)
-            break;
-      }
-
-      CUnit* tmp = m_pUnit[m_iStartPos];
-      m_pUnit[m_iStartPos] = NULL;
-      tmp->m_iFlag = 0;
-      -- m_pUnitQueue->m_iCount;
-
-      if (++ m_iStartPos == m_iSize)
-         m_iStartPos = 0;
-   }
-
-   p = -1;                  // message head
-   q = m_iStartPos;         // message tail
-   passack = m_iStartPos == m_iLastAckPos;
-   bool found = false;
-
-   // looking for the first message
-   for (int i = 0, n = m_iMaxPos + getRcvDataSize(); i <= n; ++ i)
-   {
-      if ((NULL != m_pUnit[q]) && (1 == m_pUnit[q]->m_iFlag))
-      {
-         switch (m_pUnit[q]->m_Packet.getMsgBoundary())
-         {
-         case 3: // 11
-            p = q;
-            found = true;
-            break;
-
-         case 2: // 10
-            p = q;
-            break;
-
-         case 1: // 01
-            if (p != -1)
-               found = true;
-         }
-      }
-      else
-      {
-         // a hole in this message, not valid, restart search
-         p = -1;
-      }
-
-      if (found)
-      {
-         // the msg has to be ack'ed or it is allowed to read out of order, and was not read before
-         if (!passack || !m_pUnit[q]->m_Packet.getMsgOrderFlag())
-            break;
-
-         found = false;
-      }
-
-      if (++ q == m_iSize)
-         q = 0;
-
-      if (q == m_iLastAckPos)
-         passack = true;
-   }
-
-   // no msg found
-   if (!found)
-   {
-      // if the message is larger than the receiver buffer, return part of the message
-      if ((p != -1) && ((q + 1) % m_iSize == p))
-         found = true;
-   }
-
-   return found;
-}
diff --git a/vendor/udt4/src/buffer.h b/vendor/udt4/src/buffer.h
deleted file mode 100644
index 4377e79..0000000
--- a/vendor/udt4/src/buffer.h
+++ /dev/null
@@ -1,275 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2009, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 05/05/2009
-*****************************************************************************/
-
-#ifndef __UDT_BUFFER_H__
-#define __UDT_BUFFER_H__
-
-
-#include "udt.h"
-#include "list.h"
-#include "queue.h"
-#include <fstream>
-
-class CSndBuffer
-{
-public:
-   CSndBuffer(int size = 32, int mss = 1500);
-   ~CSndBuffer();
-
-      // Functionality:
-      //    Insert a user buffer into the sending list.
-      // Parameters:
-      //    0) [in] data: pointer to the user data block.
-      //    1) [in] len: size of the block.
-      //    2) [in] ttl: time to live in milliseconds
-      //    3) [in] order: if the block should be delivered in order, for DGRAM only
-      // Returned value:
-      //    None.
-
-   void addBuffer(const char* data, int len, int ttl = -1, bool order = false);
-
-      // Functionality:
-      //    Read a block of data from file and insert it into the sending list.
-      // Parameters:
-      //    0) [in] ifs: input file stream.
-      //    1) [in] len: size of the block.
-      // Returned value:
-      //    actual size of data added from the file.
-
-   int addBufferFromFile(std::fstream& ifs, int len);
-
-      // Functionality:
-      //    Find data position to pack a DATA packet from the furthest reading point.
-      // Parameters:
-      //    0) [out] data: the pointer to the data position.
-      //    1) [out] msgno: message number of the packet.
-      // Returned value:
-      //    Actual length of data read.
-
-   int readData(char** data, int32_t& msgno);
-
-      // Functionality:
-      //    Find data position to pack a DATA packet for a retransmission.
-      // Parameters:
-      //    0) [out] data: the pointer to the data position.
-      //    1) [in] offset: offset from the last ACK point.
-      //    2) [out] msgno: message number of the packet.
-      //    3) [out] msglen: length of the message
-      // Returned value:
-      //    Actual length of data read.
-
-   int readData(char** data, const int offset, int32_t& msgno, int& msglen);
-
-      // Functionality:
-      //    Update the ACK point and may release/unmap/return the user data according to the flag.
-      // Parameters:
-      //    0) [in] offset: number of packets acknowledged.
-      // Returned value:
-      //    None.
-
-   void ackData(int offset);
-
-      // Functionality:
-      //    Read size of data still in the sending list.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Current size of the data in the sending list.
-
-   int getCurrBufSize() const;
-
-private:
-   void increase();
-
-private:
-   pthread_mutex_t m_BufLock;           // used to synchronize buffer operation
-
-   struct Block
-   {
-      char* m_pcData;                   // pointer to the data block
-      int m_iLength;                    // length of the block
-
-      int32_t m_iMsgNo;                 // message number
-      uint64_t m_OriginTime;            // original request time
-      int m_iTTL;                       // time to live (milliseconds)
-
-      Block* m_pNext;                   // next block
-   } *m_pBlock, *m_pFirstBlock, *m_pCurrBlock, *m_pLastBlock;
-
-   // m_pBlock:         The head pointer
-   // m_pFirstBlock:    The first block
-   // m_pCurrBlock:	The current block
-   // m_pLastBlock:     The last block (if first == last, buffer is empty)
-
-   struct Buffer
-   {
-      char* m_pcData;			// buffer
-      int m_iSize;			// size
-      Buffer* m_pNext;			// next buffer
-   } *m_pBuffer;			// physical buffer
-
-   int32_t m_iNextMsgNo;                // next message number
-
-   int m_iSize;				// buffer size (number of packets)
-   int m_iMSS;                          // maximum seqment/packet size
-
-   int m_iCount;			// number of used blocks
-
-private:
-   CSndBuffer(const CSndBuffer&);
-   CSndBuffer& operator=(const CSndBuffer&);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class CRcvBuffer
-{
-public:
-   CRcvBuffer(CUnitQueue* queue, int bufsize = 65536);
-   ~CRcvBuffer();
-
-      // Functionality:
-      //    Write data into the buffer.
-      // Parameters:
-      //    0) [in] unit: pointer to a data unit containing new packet
-      //    1) [in] offset: offset from last ACK point.
-      // Returned value:
-      //    0 is success, -1 if data is repeated.
-
-   int addData(CUnit* unit, int offset);
-
-      // Functionality:
-      //    Read data into a user buffer.
-      // Parameters:
-      //    0) [in] data: pointer to user buffer.
-      //    1) [in] len: length of user buffer.
-      // Returned value:
-      //    size of data read.
-
-   int readBuffer(char* data, int len);
-
-      // Functionality:
-      //    Read data directly into file.
-      // Parameters:
-      //    0) [in] file: C++ file stream.
-      //    1) [in] len: expected length of data to write into the file.
-      // Returned value:
-      //    size of data read.
-
-   int readBufferToFile(std::fstream& ofs, int len);
-
-      // Functionality:
-      //    Update the ACK point of the buffer.
-      // Parameters:
-      //    0) [in] len: size of data to be acknowledged.
-      // Returned value:
-      //    1 if a user buffer is fulfilled, otherwise 0.
-
-   void ackData(int len);
-
-      // Functionality:
-      //    Query how many buffer space left for data receiving.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    size of available buffer space (including user buffer) for data receiving.
-
-   int getAvailBufSize() const;
-
-      // Functionality:
-      //    Query how many data has been continuously received (for reading).
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    size of valid (continous) data for reading.
-
-   int getRcvDataSize() const;
-
-      // Functionality:
-      //    mark the message to be dropped from the message list.
-      // Parameters:
-      //    0) [in] msgno: message nuumer.
-      // Returned value:
-      //    None.
-
-   void dropMsg(int32_t msgno);
-
-      // Functionality:
-      //    read a message.
-      // Parameters:
-      //    0) [out] data: buffer to write the message into.
-      //    1) [in] len: size of the buffer.
-      // Returned value:
-      //    actuall size of data read.
-
-   int readMsg(char* data, int len);
-
-      // Functionality:
-      //    Query how many messages are available now.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    number of messages available for recvmsg.
-
-   int getRcvMsgNum();
-
-private:
-   bool scanMsg(int& start, int& end, bool& passack);
-
-private:
-   CUnit** m_pUnit;                     // pointer to the protocol buffer
-   int m_iSize;                         // size of the protocol buffer
-   CUnitQueue* m_pUnitQueue;		// the shared unit queue
-
-   int m_iStartPos;                     // the head position for I/O (inclusive)
-   int m_iLastAckPos;                   // the last ACKed position (exclusive)
-					// EMPTY: m_iStartPos = m_iLastAckPos   FULL: m_iStartPos = m_iLastAckPos + 1
-   int m_iMaxPos;			// the furthest data position
-
-   int m_iNotch;			// the starting read point of the first unit
-
-private:
-   CRcvBuffer();
-   CRcvBuffer(const CRcvBuffer&);
-   CRcvBuffer& operator=(const CRcvBuffer&);
-};
-
-
-#endif
diff --git a/vendor/udt4/src/cache.cpp b/vendor/udt4/src/cache.cpp
deleted file mode 100644
index ea0aad1..0000000
--- a/vendor/udt4/src/cache.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2009, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 05/05/2009
-*****************************************************************************/
-
-#ifdef WIN32
-   #include <winsock2.h>
-   #include <ws2tcpip.h>
-   #ifdef LEGACY_WIN32
-      #include <wspiapi.h>
-   #endif
-#endif
-
-#include <cstring>
-#include "cache.h"
-#include "core.h"
-
-using namespace std;
-
-CInfoBlock& CInfoBlock::operator=(const CInfoBlock& obj)
-{
-   std::copy(obj.m_piIP, obj.m_piIP + 3, m_piIP);
-   m_iIPversion = obj.m_iIPversion;
-   m_ullTimeStamp = obj.m_ullTimeStamp;
-   m_iRTT = obj.m_iRTT;
-   m_iBandwidth = obj.m_iBandwidth;
-   m_iLossRate = obj.m_iLossRate;
-   m_iReorderDistance = obj.m_iReorderDistance;
-   m_dInterval = obj.m_dInterval;
-   m_dCWnd = obj.m_dCWnd;
-
-   return *this;
-}
-
-bool CInfoBlock::operator==(const CInfoBlock& obj)
-{
-   if (m_iIPversion != obj.m_iIPversion)
-      return false;
-
-   else if (m_iIPversion == AF_INET)
-      return (m_piIP[0] == obj.m_piIP[0]);
-
-   for (int i = 0; i < 4; ++ i)
-   {
-      if (m_piIP[i] != obj.m_piIP[i])
-         return false;
-   }
-
-   return true;
-}
-
-CInfoBlock* CInfoBlock::clone()
-{
-   CInfoBlock* obj = new CInfoBlock;
-
-   std::copy(m_piIP, m_piIP + 3, obj->m_piIP);
-   obj->m_iIPversion = m_iIPversion;
-   obj->m_ullTimeStamp = m_ullTimeStamp;
-   obj->m_iRTT = m_iRTT;
-   obj->m_iBandwidth = m_iBandwidth;
-   obj->m_iLossRate = m_iLossRate;
-   obj->m_iReorderDistance = m_iReorderDistance;
-   obj->m_dInterval = m_dInterval;
-   obj->m_dCWnd = m_dCWnd;
-
-   return obj;
-}
-
-int CInfoBlock::getKey()
-{
-   if (m_iIPversion == AF_INET)
-      return m_piIP[0];
-
-   return m_piIP[0] + m_piIP[1] + m_piIP[2] + m_piIP[3];
-}
-
-void CInfoBlock::convert(const sockaddr* addr, int ver, uint32_t ip[])
-{
-   if (ver == AF_INET)
-   {
-      ip[0] = ((sockaddr_in*)addr)->sin_addr.s_addr;
-      ip[1] = ip[2] = ip[3] = 0;
-   }
-   else
-   {
-      memcpy((char*)ip, (char*)((sockaddr_in6*)addr)->sin6_addr.s6_addr, 16);
-   }
-}
diff --git a/vendor/udt4/src/cache.h b/vendor/udt4/src/cache.h
deleted file mode 100644
index 22d9624..0000000
--- a/vendor/udt4/src/cache.h
+++ /dev/null
@@ -1,293 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/27/2011
-*****************************************************************************/
-
-#ifndef __UDT_CACHE_H__
-#define __UDT_CACHE_H__
-
-#include <list>
-#include <vector>
-
-#include "common.h"
-#include "udt.h"
-
-class CCacheItem
-{
-public:
-   virtual ~CCacheItem() {}
-
-public:
-   virtual CCacheItem& operator=(const CCacheItem&) = 0;
-
-   // The "==" operator SHOULD only compare key values.
-   virtual bool operator==(const CCacheItem&) = 0;
-
-      // Functionality:
-      //    get a deep copy clone of the current item
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Pointer to the new item, or NULL if failed.
-
-   virtual CCacheItem* clone() = 0;
-
-      // Functionality:
-      //    get a random key value between 0 and MAX_INT to be used for the hash in cache
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    A random hash key.
-
-   virtual int getKey() = 0;
-
-   // If there is any shared resources between the cache item and its clone,
-   // the shared resource should be released by this function.
-   virtual void release() {}
-};
-
-template<typename T> class CCache
-{
-public:
-   CCache(int size = 1024):
-   m_iMaxSize(size),
-   m_iHashSize(size * 3),
-   m_iCurrSize(0)
-   {
-      m_vHashPtr.resize(m_iHashSize);
-      CGuard::createMutex(m_Lock);
-   }
-
-   ~CCache()
-   {
-      clear();
-      CGuard::releaseMutex(m_Lock);
-   }
-
-public:
-      // Functionality:
-      //    find the matching item in the cache.
-      // Parameters:
-      //    0) [in/out] data: storage for the retrieved item; initially it must carry the key information
-      // Returned value:
-      //    0 if found a match, otherwise -1.
-
-   int lookup(T* data)
-   {
-      CGuard cacheguard(m_Lock);
-
-      int key = data->getKey();
-      if (key < 0)
-         return -1;
-      if (key >= m_iMaxSize)
-         key %= m_iHashSize;
-
-      const ItemPtrList& item_list = m_vHashPtr[key];
-      for (typename ItemPtrList::const_iterator i = item_list.begin(); i != item_list.end(); ++ i)
-      {
-         if (*data == ***i)
-         {
-            // copy the cached info
-            *data = ***i;
-            return 0;
-         }
-      }
-
-      return -1;
-   }
-
-      // Functionality:
-      //    update an item in the cache, or insert one if it doesn't exist; oldest item may be removed
-      // Parameters:
-      //    0) [in] data: the new item to updated/inserted to the cache
-      // Returned value:
-      //    0 if success, otherwise -1.
-
-   int update(T* data)
-   {
-      CGuard cacheguard(m_Lock);
-
-      int key = data->getKey();
-      if (key < 0)
-         return -1;
-      if (key >= m_iMaxSize)
-         key %= m_iHashSize;
-
-      T* curr = NULL;
-
-      ItemPtrList& item_list = m_vHashPtr[key];
-      for (typename ItemPtrList::iterator i = item_list.begin(); i != item_list.end(); ++ i)
-      {
-         if (*data == ***i)
-         {
-            // update the existing entry with the new value
-            ***i = *data;
-            curr = **i;
-
-            // remove the current entry
-            m_StorageList.erase(*i);
-            item_list.erase(i);
-
-            // re-insert to the front
-            m_StorageList.push_front(curr);
-            item_list.push_front(m_StorageList.begin());
-
-            return 0;
-         }
-      }
-
-      // create new entry and insert to front
-      curr = data->clone();
-      m_StorageList.push_front(curr);
-      item_list.push_front(m_StorageList.begin());
-
-      ++ m_iCurrSize;
-      if (m_iCurrSize >= m_iMaxSize)
-      {
-         // Cache overflow, remove oldest entry.
-         T* last_data = m_StorageList.back();
-         int last_key = last_data->getKey() % m_iHashSize;
-
-         item_list = m_vHashPtr[last_key];
-         for (typename ItemPtrList::iterator i = item_list.begin(); i != item_list.end(); ++ i)
-         {
-            if (*last_data == ***i)
-            {
-               item_list.erase(i);
-               break;
-            }
-         }
-
-         last_data->release();
-         delete last_data;
-         m_StorageList.pop_back();
-         -- m_iCurrSize;
-      }
-
-      return 0;
-   }
-
-      // Functionality:
-      //    Specify the cache size (i.e., max number of items).
-      // Parameters:
-      //    0) [in] size: max cache size.
-      // Returned value:
-      //    None.
-
-   void setSizeLimit(int size)
-   {
-      m_iMaxSize = size;
-      m_iHashSize = size * 3;
-      m_vHashPtr.resize(m_iHashSize);
-   }
-
-      // Functionality:
-      //    Clear all entries in the cache, restore to initialization state.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void clear()
-   {
-      for (typename std::list<T*>::iterator i = m_StorageList.begin(); i != m_StorageList.end(); ++ i)
-      {
-         (*i)->release();
-         delete *i;
-      }
-      m_StorageList.clear();
-      for (typename std::vector<ItemPtrList>::iterator i = m_vHashPtr.begin(); i != m_vHashPtr.end(); ++ i)
-         i->clear();
-      m_iCurrSize = 0;
-   }
-
-private:
-   std::list<T*> m_StorageList;
-   typedef typename std::list<T*>::iterator ItemPtr;
-   typedef std::list<ItemPtr> ItemPtrList;
-   std::vector<ItemPtrList> m_vHashPtr;
-
-   int m_iMaxSize;
-   int m_iHashSize;
-   int m_iCurrSize;
-
-   pthread_mutex_t m_Lock;
-
-private:
-   CCache(const CCache&);
-   CCache& operator=(const CCache&);
-};
-
-
-class CInfoBlock
-{
-public:
-   uint32_t m_piIP[4];		// IP address, machine read only, not human readable format
-   int m_iIPversion;		// IP version
-   uint64_t m_ullTimeStamp;	// last update time
-   int m_iRTT;			// RTT
-   int m_iBandwidth;		// estimated bandwidth
-   int m_iLossRate;		// average loss rate
-   int m_iReorderDistance;	// packet reordering distance
-   double m_dInterval;		// inter-packet time, congestion control
-   double m_dCWnd;		// congestion window size, congestion control
-
-public:
-   virtual ~CInfoBlock() {}
-   virtual CInfoBlock& operator=(const CInfoBlock& obj);
-   virtual bool operator==(const CInfoBlock& obj);
-   virtual CInfoBlock* clone();
-   virtual int getKey();
-   virtual void release() {}
-
-public:
-
-      // Functionality:
-      //    convert sockaddr structure to an integer array
-      // Parameters:
-      //    0) [in] addr: network address
-      //    1) [in] ver: IP version
-      //    2) [out] ip: the result machine readable IP address in integer array
-      // Returned value:
-      //    None.
-
-   static void convert(const sockaddr* addr, int ver, uint32_t ip[]);
-};
-
-
-#endif
diff --git a/vendor/udt4/src/ccc.cpp b/vendor/udt4/src/ccc.cpp
deleted file mode 100644
index 048b7ec..0000000
--- a/vendor/udt4/src/ccc.cpp
+++ /dev/null
@@ -1,314 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 02/21/2013
-*****************************************************************************/
-
-
-#include "core.h"
-#include "ccc.h"
-#include <cmath>
-#include <cstring>
-
-CCC::CCC():
-m_iSYNInterval(CUDT::m_iSYNInterval),
-m_dPktSndPeriod(1.0),
-m_dCWndSize(16.0),
-m_iBandwidth(),
-m_dMaxCWndSize(),
-m_iMSS(),
-m_iSndCurrSeqNo(),
-m_iRcvRate(),
-m_iRTT(),
-m_pcParam(NULL),
-m_iPSize(0),
-m_UDT(),
-m_iACKPeriod(0),
-m_iACKInterval(0),
-m_bUserDefinedRTO(false),
-m_iRTO(-1),
-m_PerfInfo()
-{
-}
-
-CCC::~CCC()
-{
-   delete [] m_pcParam;
-}
-
-void CCC::setACKTimer(int msINT)
-{
-   m_iACKPeriod = msINT > m_iSYNInterval ? m_iSYNInterval : msINT;
-}
-
-void CCC::setACKInterval(int pktINT)
-{
-   m_iACKInterval = pktINT;
-}
-
-void CCC::setRTO(int usRTO)
-{
-   m_bUserDefinedRTO = true;
-   m_iRTO = usRTO;
-}
-
-void CCC::sendCustomMsg(CPacket& pkt) const
-{
-   CUDT* u = CUDT::getUDTHandle(m_UDT);
-
-   if (NULL != u)
-   {
-      pkt.m_iID = u->m_PeerID;
-      u->m_pSndQueue->sendto(u->m_pPeerAddr, pkt);
-   }
-}
-
-const CPerfMon* CCC::getPerfInfo()
-{
-   try
-   {
-      CUDT* u = CUDT::getUDTHandle(m_UDT);
-      if (NULL != u)
-         u->sample(&m_PerfInfo, false);
-   }
-   catch (...)
-   {
-      return NULL;
-   }
-
-   return &m_PerfInfo;
-}
-
-void CCC::setMSS(int mss)
-{
-   m_iMSS = mss;
-}
-
-void CCC::setBandwidth(int bw)
-{
-   m_iBandwidth = bw;
-}
-
-void CCC::setSndCurrSeqNo(int32_t seqno)
-{
-   m_iSndCurrSeqNo = seqno;
-}
-
-void CCC::setRcvRate(int rcvrate)
-{
-   m_iRcvRate = rcvrate;
-}
-
-void CCC::setMaxCWndSize(int cwnd)
-{
-   m_dMaxCWndSize = cwnd;
-}
-
-void CCC::setRTT(int rtt)
-{
-   m_iRTT = rtt;
-}
-
-void CCC::setUserParam(const char* param, int size)
-{
-   delete [] m_pcParam;
-   m_pcParam = new char[size];
-   memcpy(m_pcParam, param, size);
-   m_iPSize = size;
-}
-
-//
-CUDTCC::CUDTCC():
-m_iRCInterval(),
-m_LastRCTime(),
-m_bSlowStart(),
-m_iLastAck(),
-m_bLoss(),
-m_iLastDecSeq(),
-m_dLastDecPeriod(),
-m_iNAKCount(),
-m_iDecRandom(),
-m_iAvgNAKNum(),
-m_iDecCount()
-{
-}
-
-void CUDTCC::init()
-{
-   m_iRCInterval = m_iSYNInterval;
-   m_LastRCTime = CTimer::getTime();
-   setACKTimer(m_iRCInterval);
-
-   m_bSlowStart = true;
-   m_iLastAck = m_iSndCurrSeqNo;
-   m_bLoss = false;
-   m_iLastDecSeq = CSeqNo::decseq(m_iLastAck);
-   m_dLastDecPeriod = 1;
-   m_iAvgNAKNum = 0;
-   m_iNAKCount = 0;
-   m_iDecRandom = 1;
-
-   m_dCWndSize = 16;
-   m_dPktSndPeriod = 1;
-}
-
-void CUDTCC::onACK(int32_t ack)
-{
-   int64_t B = 0;
-   double inc = 0;
-   // Note: 1/24/2012
-   // The minimum increase parameter is increased from "1.0 / m_iMSS" to 0.01
-   // because the original was too small and caused sending rate to stay at low level
-   // for long time.
-   const double min_inc = 0.01;
-
-   uint64_t currtime = CTimer::getTime();
-   if (currtime - m_LastRCTime < (uint64_t)m_iRCInterval)
-      return;
-
-   m_LastRCTime = currtime;
-
-   if (m_bSlowStart)
-   {
-      m_dCWndSize += CSeqNo::seqlen(m_iLastAck, ack);
-      m_iLastAck = ack;
-
-      if (m_dCWndSize > m_dMaxCWndSize)
-      {
-         m_bSlowStart = false;
-         if (m_iRcvRate > 0)
-            m_dPktSndPeriod = 1000000.0 / m_iRcvRate;
-         else
-            m_dPktSndPeriod = (m_iRTT + m_iRCInterval) / m_dCWndSize;
-      }
-   }
-   else
-      m_dCWndSize = m_iRcvRate / 1000000.0 * (m_iRTT + m_iRCInterval) + 16;
-
-   // During Slow Start, no rate increase
-   if (m_bSlowStart)
-      return;
-
-   if (m_bLoss)
-   {
-      m_bLoss = false;
-      return;
-   }
-
-   B = (int64_t)(m_iBandwidth - 1000000.0 / m_dPktSndPeriod);
-   if ((m_dPktSndPeriod > m_dLastDecPeriod) && ((m_iBandwidth / 9) < B))
-      B = m_iBandwidth / 9;
-   if (B <= 0)
-      inc = min_inc;
-   else
-   {
-      // inc = max(10 ^ ceil(log10( B * MSS * 8 ) * Beta / MSS, 1/MSS)
-      // Beta = 1.5 * 10^(-6)
-
-      inc = pow(10.0, ceil(log10(B * m_iMSS * 8.0))) * 0.0000015 / m_iMSS;
-
-      if (inc < min_inc)
-         inc = min_inc;
-   }
-
-   m_dPktSndPeriod = (m_dPktSndPeriod * m_iRCInterval) / (m_dPktSndPeriod * inc + m_iRCInterval);
-}
-
-void CUDTCC::onLoss(const int32_t* losslist, int)
-{
-   //Slow Start stopped, if it hasn't yet
-   if (m_bSlowStart)
-   {
-      m_bSlowStart = false;
-      if (m_iRcvRate > 0)
-      {
-         // Set the sending rate to the receiving rate.
-         m_dPktSndPeriod = 1000000.0 / m_iRcvRate;
-         return;
-      }
-      // If no receiving rate is observed, we have to compute the sending
-      // rate according to the current window size, and decrease it
-      // using the method below.
-      m_dPktSndPeriod = m_dCWndSize / (m_iRTT + m_iRCInterval);
-   }
-
-   m_bLoss = true;
-
-   if (CSeqNo::seqcmp(losslist[0] & 0x7FFFFFFF, m_iLastDecSeq) > 0)
-   {
-      m_dLastDecPeriod = m_dPktSndPeriod;
-      m_dPktSndPeriod = ceil(m_dPktSndPeriod * 1.125);
-
-      m_iAvgNAKNum = (int)ceil(m_iAvgNAKNum * 0.875 + m_iNAKCount * 0.125);
-      m_iNAKCount = 1;
-      m_iDecCount = 1;
-
-      m_iLastDecSeq = m_iSndCurrSeqNo;
-
-      // remove global synchronization using randomization
-      srand(m_iLastDecSeq);
-      m_iDecRandom = (int)ceil(m_iAvgNAKNum * (double(rand()) / RAND_MAX));
-      if (m_iDecRandom < 1)
-         m_iDecRandom = 1;
-   }
-   else if ((m_iDecCount ++ < 5) && (0 == (++ m_iNAKCount % m_iDecRandom)))
-   {
-      // 0.875^5 = 0.51, rate should not be decreased by more than half within a congestion period
-      m_dPktSndPeriod = ceil(m_dPktSndPeriod * 1.125);
-      m_iLastDecSeq = m_iSndCurrSeqNo;
-   }
-}
-
-void CUDTCC::onTimeout()
-{
-   if (m_bSlowStart)
-   {
-      m_bSlowStart = false;
-      if (m_iRcvRate > 0)
-         m_dPktSndPeriod = 1000000.0 / m_iRcvRate;
-      else
-         m_dPktSndPeriod = m_dCWndSize / (m_iRTT + m_iRCInterval);
-   }
-   else
-   {
-      /*
-      m_dLastDecPeriod = m_dPktSndPeriod;
-      m_dPktSndPeriod = ceil(m_dPktSndPeriod * 2);
-      m_iLastDecSeq = m_iLastAck;
-      */
-   }
-}
diff --git a/vendor/udt4/src/ccc.h b/vendor/udt4/src/ccc.h
deleted file mode 100644
index 5585975..0000000
--- a/vendor/udt4/src/ccc.h
+++ /dev/null
@@ -1,278 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2009, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 02/28/2012
-*****************************************************************************/
-
-
-#ifndef __UDT_CCC_H__
-#define __UDT_CCC_H__
-
-
-#include "udt.h"
-#include "packet.h"
-
-
-class UDT_API CCC
-{
-friend class CUDT;
-
-public:
-   CCC();
-   virtual ~CCC();
-
-private:
-   CCC(const CCC&);
-   CCC& operator=(const CCC&) {return *this;}
-
-public:
-
-      // Functionality:
-      //    Callback function to be called (only) at the start of a UDT connection.
-      //    note that this is different from CCC(), which is always called.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   virtual void init() {}
-
-      // Functionality:
-      //    Callback function to be called when a UDT connection is closed.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   virtual void close() {}
-
-      // Functionality:
-      //    Callback function to be called when an ACK packet is received.
-      // Parameters:
-      //    0) [in] ackno: the data sequence number acknowledged by this ACK.
-      // Returned value:
-      //    None.
-
-   virtual void onACK(int32_t) {}
-
-      // Functionality:
-      //    Callback function to be called when a loss report is received.
-      // Parameters:
-      //    0) [in] losslist: list of sequence number of packets, in the format describled in packet.cpp.
-      //    1) [in] size: length of the loss list.
-      // Returned value:
-      //    None.
-
-   virtual void onLoss(const int32_t*, int) {}
-
-      // Functionality:
-      //    Callback function to be called when a timeout event occurs.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   virtual void onTimeout() {}
-
-      // Functionality:
-      //    Callback function to be called when a data is sent.
-      // Parameters:
-      //    0) [in] seqno: the data sequence number.
-      //    1) [in] size: the payload size.
-      // Returned value:
-      //    None.
-
-   virtual void onPktSent(const CPacket*) {}
-
-      // Functionality:
-      //    Callback function to be called when a data is received.
-      // Parameters:
-      //    0) [in] seqno: the data sequence number.
-      //    1) [in] size: the payload size.
-      // Returned value:
-      //    None.
-
-   virtual void onPktReceived(const CPacket*) {}
-
-      // Functionality:
-      //    Callback function to Process a user defined packet.
-      // Parameters:
-      //    0) [in] pkt: the user defined packet.
-      // Returned value:
-      //    None.
-
-   virtual void processCustomMsg(const CPacket*) {}
-
-protected:
-
-      // Functionality:
-      //    Set periodical acknowldging and the ACK period.
-      // Parameters:
-      //    0) [in] msINT: the period to send an ACK.
-      // Returned value:
-      //    None.
-
-   void setACKTimer(int msINT);
-
-      // Functionality:
-      //    Set packet-based acknowldging and the number of packets to send an ACK.
-      // Parameters:
-      //    0) [in] pktINT: the number of packets to send an ACK.
-      // Returned value:
-      //    None.
-
-   void setACKInterval(int pktINT);
-
-      // Functionality:
-      //    Set RTO value.
-      // Parameters:
-      //    0) [in] msRTO: RTO in macroseconds.
-      // Returned value:
-      //    None.
-
-   void setRTO(int usRTO);
-
-      // Functionality:
-      //    Send a user defined control packet.
-      // Parameters:
-      //    0) [in] pkt: user defined packet.
-      // Returned value:
-      //    None.
-
-   void sendCustomMsg(CPacket& pkt) const;
-
-      // Functionality:
-      //    retrieve performance information.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Pointer to a performance info structure.
-
-   const CPerfMon* getPerfInfo();
-
-      // Functionality:
-      //    Set user defined parameters.
-      // Parameters:
-      //    0) [in] param: the paramters in one buffer.
-      //    1) [in] size: the size of the buffer.
-      // Returned value:
-      //    None.
-
-   void setUserParam(const char* param, int size);
-
-private:
-   void setMSS(int mss);
-   void setMaxCWndSize(int cwnd);
-   void setBandwidth(int bw);
-   void setSndCurrSeqNo(int32_t seqno);
-   void setRcvRate(int rcvrate);
-   void setRTT(int rtt);
-
-protected:
-   const int32_t& m_iSYNInterval;	// UDT constant parameter, SYN
-
-   double m_dPktSndPeriod;              // Packet sending period, in microseconds
-   double m_dCWndSize;                  // Congestion window size, in packets
-
-   int m_iBandwidth;			// estimated bandwidth, packets per second
-   double m_dMaxCWndSize;               // maximum cwnd size, in packets
-
-   int m_iMSS;				// Maximum Packet Size, including all packet headers
-   int32_t m_iSndCurrSeqNo;		// current maximum seq no sent out
-   int m_iRcvRate;			// packet arrive rate at receiver side, packets per second
-   int m_iRTT;				// current estimated RTT, microsecond
-
-   char* m_pcParam;			// user defined parameter
-   int m_iPSize;			// size of m_pcParam
-
-private:
-   UDTSOCKET m_UDT;                     // The UDT entity that this congestion control algorithm is bound to
-
-   int m_iACKPeriod;                    // Periodical timer to send an ACK, in milliseconds
-   int m_iACKInterval;                  // How many packets to send one ACK, in packets
-
-   bool m_bUserDefinedRTO;              // if the RTO value is defined by users
-   int m_iRTO;                          // RTO value, microseconds
-
-   CPerfMon m_PerfInfo;                 // protocol statistics information
-};
-
-class CCCVirtualFactory
-{
-public:
-   virtual ~CCCVirtualFactory() {}
-
-   virtual CCC* create() = 0;
-   virtual CCCVirtualFactory* clone() = 0;
-};
-
-template <class T>
-class CCCFactory: public CCCVirtualFactory
-{
-public:
-   virtual ~CCCFactory() {}
-
-   virtual CCC* create() {return new T;}
-   virtual CCCVirtualFactory* clone() {return new CCCFactory<T>;}
-};
-
-class CUDTCC: public CCC
-{
-public:
-   CUDTCC();
-
-public:
-   virtual void init();
-   virtual void onACK(int32_t);
-   virtual void onLoss(const int32_t*, int);
-   virtual void onTimeout();
-
-private:
-   int m_iRCInterval;			// UDT Rate control interval
-   uint64_t m_LastRCTime;		// last rate increase time
-   bool m_bSlowStart;			// if in slow start phase
-   int32_t m_iLastAck;			// last ACKed seq no
-   bool m_bLoss;			// if loss happened since last rate increase
-   int32_t m_iLastDecSeq;		// max pkt seq no sent out when last decrease happened
-   double m_dLastDecPeriod;		// value of pktsndperiod when last decrease happened
-   int m_iNAKCount;                     // NAK counter
-   int m_iDecRandom;                    // random threshold on decrease by number of loss events
-   int m_iAvgNAKNum;                    // average number of NAKs per congestion
-   int m_iDecCount;			// number of decreases in a congestion epoch
-};
-
-#endif
diff --git a/vendor/udt4/src/channel.cpp b/vendor/udt4/src/channel.cpp
deleted file mode 100644
index 7b010f0..0000000
--- a/vendor/udt4/src/channel.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-****************************************************************************/
-
-/****************************************************************************
-written by
-   Yunhong Gu, last updated 01/27/2011
-*****************************************************************************/
-
-#ifndef WIN32
-   #include <netdb.h>
-   #include <arpa/inet.h>
-   #include <unistd.h>
-   #include <fcntl.h>
-   #include <cstring>
-   #include <cstdio>
-   #include <cerrno>
-#else
-   #include <winsock2.h>
-   #include <ws2tcpip.h>
-   #ifdef LEGACY_WIN32
-      #include <wspiapi.h>
-   #endif
-#endif
-#include "channel.h"
-#include "packet.h"
-
-#ifdef WIN32
-   #define socklen_t int
-#endif
-
-#ifndef WIN32
-   #define NET_ERROR errno
-#else
-   #define NET_ERROR WSAGetLastError()
-#endif
-
-
-CChannel::CChannel():
-m_iIPversion(AF_INET),
-m_iSockAddrSize(sizeof(sockaddr_in)),
-m_iSocket(),
-m_iSndBufSize(65536),
-m_iRcvBufSize(65536)
-{
-}
-
-CChannel::CChannel(int version):
-m_iIPversion(version),
-m_iSocket(),
-m_iSndBufSize(65536),
-m_iRcvBufSize(65536)
-{
-   m_iSockAddrSize = (AF_INET == m_iIPversion) ? sizeof(sockaddr_in) : sizeof(sockaddr_in6);
-}
-
-CChannel::~CChannel()
-{
-}
-
-void CChannel::open(const sockaddr* addr)
-{
-   // construct an socket
-   m_iSocket = ::socket(m_iIPversion, SOCK_DGRAM, 0);
-
-   #ifdef WIN32
-      if (INVALID_SOCKET == m_iSocket)
-   #else
-      if (m_iSocket < 0)
-   #endif
-      throw CUDTException(1, 0, NET_ERROR);
-
-   if (NULL != addr)
-   {
-      socklen_t namelen = m_iSockAddrSize;
-
-      if (0 != ::bind(m_iSocket, addr, namelen))
-         throw CUDTException(1, 3, NET_ERROR);
-   }
-   else
-   {
-      //sendto or WSASendTo will also automatically bind the socket
-      addrinfo hints;
-      addrinfo* res;
-
-      memset(&hints, 0, sizeof(struct addrinfo));
-
-      hints.ai_flags = AI_PASSIVE;
-      hints.ai_family = m_iIPversion;
-      hints.ai_socktype = SOCK_DGRAM;
-
-      if (0 != ::getaddrinfo(NULL, "0", &hints, &res))
-         throw CUDTException(1, 3, NET_ERROR);
-
-      if (0 != ::bind(m_iSocket, res->ai_addr, res->ai_addrlen))
-         throw CUDTException(1, 3, NET_ERROR);
-
-      ::freeaddrinfo(res);
-   }
-
-   setUDPSockOpt();
-}
-
-void CChannel::open(UDPSOCKET udpsock)
-{
-   m_iSocket = udpsock;
-   setUDPSockOpt();
-}
-
-void CChannel::setUDPSockOpt()
-{
-   #if defined(BSD) || defined(OSX)
-      // BSD system will fail setsockopt if the requested buffer size exceeds system maximum value
-      int maxsize = 64000;
-      if (0 != ::setsockopt(m_iSocket, SOL_SOCKET, SO_RCVBUF, (char*)&m_iRcvBufSize, sizeof(int)))
-         ::setsockopt(m_iSocket, SOL_SOCKET, SO_RCVBUF, (char*)&maxsize, sizeof(int));
-      if (0 != ::setsockopt(m_iSocket, SOL_SOCKET, SO_SNDBUF, (char*)&m_iSndBufSize, sizeof(int)))
-         ::setsockopt(m_iSocket, SOL_SOCKET, SO_SNDBUF, (char*)&maxsize, sizeof(int));
-   #else
-      // for other systems, if requested is greated than maximum, the maximum value will be automactally used
-      if ((0 != ::setsockopt(m_iSocket, SOL_SOCKET, SO_RCVBUF, (char*)&m_iRcvBufSize, sizeof(int))) ||
-          (0 != ::setsockopt(m_iSocket, SOL_SOCKET, SO_SNDBUF, (char*)&m_iSndBufSize, sizeof(int))))
-         throw CUDTException(1, 3, NET_ERROR);
-   #endif
-
-   timeval tv;
-   tv.tv_sec = 0;
-   #if defined (BSD) || defined (OSX)
-      // Known BSD bug as the day I wrote this code.
-      // A small time out value will cause the socket to block forever.
-      tv.tv_usec = 10000;
-   #else
-      tv.tv_usec = 100;
-   #endif
-
-   #ifdef UNIX
-      // Set non-blocking I/O
-      // UNIX does not support SO_RCVTIMEO
-      int opts = ::fcntl(m_iSocket, F_GETFL);
-      if (-1 == ::fcntl(m_iSocket, F_SETFL, opts | O_NONBLOCK))
-         throw CUDTException(1, 3, NET_ERROR);
-   #elif WIN32
-      DWORD ot = 1; //milliseconds
-      if (0 != ::setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, (char *)&ot, sizeof(DWORD)))
-         throw CUDTException(1, 3, NET_ERROR);
-   #else
-      // Set receiving time-out value
-      if (0 != ::setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(timeval)))
-         throw CUDTException(1, 3, NET_ERROR);
-   #endif
-}
-
-void CChannel::close() const
-{
-   #ifndef WIN32
-      ::close(m_iSocket);
-   #else
-      ::closesocket(m_iSocket);
-   #endif
-}
-
-int CChannel::getSndBufSize()
-{
-   socklen_t size = sizeof(socklen_t);
-   ::getsockopt(m_iSocket, SOL_SOCKET, SO_SNDBUF, (char *)&m_iSndBufSize, &size);
-   return m_iSndBufSize;
-}
-
-int CChannel::getRcvBufSize()
-{
-   socklen_t size = sizeof(socklen_t);
-   ::getsockopt(m_iSocket, SOL_SOCKET, SO_RCVBUF, (char *)&m_iRcvBufSize, &size);
-   return m_iRcvBufSize;
-}
-
-void CChannel::setSndBufSize(int size)
-{
-   m_iSndBufSize = size;
-}
-
-void CChannel::setRcvBufSize(int size)
-{
-   m_iRcvBufSize = size;
-}
-
-void CChannel::getSockAddr(sockaddr* addr) const
-{
-   socklen_t namelen = m_iSockAddrSize;
-   ::getsockname(m_iSocket, addr, &namelen);
-}
-
-void CChannel::getPeerAddr(sockaddr* addr) const
-{
-   socklen_t namelen = m_iSockAddrSize;
-   ::getpeername(m_iSocket, addr, &namelen);
-}
-
-int CChannel::sendto(const sockaddr* addr, CPacket& packet) const
-{
-   // convert control information into network order
-   if (packet.getFlag())
-      for (int i = 0, n = packet.getLength() / 4; i < n; ++ i)
-         *((uint32_t *)packet.m_pcData + i) = htonl(*((uint32_t *)packet.m_pcData + i));
-
-   // convert packet header into network order
-   //for (int j = 0; j < 4; ++ j)
-   //   packet.m_nHeader[j] = htonl(packet.m_nHeader[j]);
-   uint32_t* p = packet.m_nHeader;
-   for (int j = 0; j < 4; ++ j)
-   {
-      *p = htonl(*p);
-      ++ p;
-   }
-
-   #ifndef WIN32
-      msghdr mh;
-      mh.msg_name = (sockaddr*)addr;
-      mh.msg_namelen = m_iSockAddrSize;
-      mh.msg_iov = (iovec*)packet.m_PacketVector;
-      mh.msg_iovlen = 2;
-      mh.msg_control = NULL;
-      mh.msg_controllen = 0;
-      mh.msg_flags = 0;
-
-      int res = ::sendmsg(m_iSocket, &mh, 0);
-   #else
-      DWORD size = CPacket::m_iPktHdrSize + packet.getLength();
-      int addrsize = m_iSockAddrSize;
-      int res = ::WSASendTo(m_iSocket, (LPWSABUF)packet.m_PacketVector, 2, &size, 0, addr, addrsize, NULL, NULL);
-      res = (0 == res) ? size : -1;
-   #endif
-
-   // convert back into local host order
-   //for (int k = 0; k < 4; ++ k)
-   //   packet.m_nHeader[k] = ntohl(packet.m_nHeader[k]);
-   p = packet.m_nHeader;
-   for (int k = 0; k < 4; ++ k)
-   {
-      *p = ntohl(*p);
-       ++ p;
-   }
-
-   if (packet.getFlag())
-   {
-      for (int l = 0, n = packet.getLength() / 4; l < n; ++ l)
-         *((uint32_t *)packet.m_pcData + l) = ntohl(*((uint32_t *)packet.m_pcData + l));
-   }
-
-   return res;
-}
-
-int CChannel::recvfrom(sockaddr* addr, CPacket& packet) const
-{
-   #ifndef WIN32
-      msghdr mh;   
-      mh.msg_name = addr;
-      mh.msg_namelen = m_iSockAddrSize;
-      mh.msg_iov = packet.m_PacketVector;
-      mh.msg_iovlen = 2;
-      mh.msg_control = NULL;
-      mh.msg_controllen = 0;
-      mh.msg_flags = 0;
-
-      #ifdef UNIX
-         fd_set set;
-         timeval tv;
-         FD_ZERO(&set);
-         FD_SET(m_iSocket, &set);
-         tv.tv_sec = 0;
-         tv.tv_usec = 10000;
-         ::select(m_iSocket+1, &set, NULL, &set, &tv);
-      #endif
-
-      int res = ::recvmsg(m_iSocket, &mh, 0);
-   #else
-      DWORD size = CPacket::m_iPktHdrSize + packet.getLength();
-      DWORD flag = 0;
-      int addrsize = m_iSockAddrSize;
-
-      int res = ::WSARecvFrom(m_iSocket, (LPWSABUF)packet.m_PacketVector, 2, &size, &flag, addr, &addrsize, NULL, NULL);
-      res = (0 == res) ? size : -1;
-   #endif
-
-   if (res <= 0)
-   {
-      packet.setLength(-1);
-      return -1;
-   }
-
-   packet.setLength(res - CPacket::m_iPktHdrSize);
-
-   // convert back into local host order
-   //for (int i = 0; i < 4; ++ i)
-   //   packet.m_nHeader[i] = ntohl(packet.m_nHeader[i]);
-   uint32_t* p = packet.m_nHeader;
-   for (int i = 0; i < 4; ++ i)
-   {
-      *p = ntohl(*p);
-      ++ p;
-   }
-
-   if (packet.getFlag())
-   {
-      for (int j = 0, n = packet.getLength() / 4; j < n; ++ j)
-         *((uint32_t *)packet.m_pcData + j) = ntohl(*((uint32_t *)packet.m_pcData + j));
-   }
-
-   return packet.getLength();
-}
diff --git a/vendor/udt4/src/channel.h b/vendor/udt4/src/channel.h
deleted file mode 100644
index 0e47acc..0000000
--- a/vendor/udt4/src/channel.h
+++ /dev/null
@@ -1,171 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/27/2011
-*****************************************************************************/
-
-#ifndef __UDT_CHANNEL_H__
-#define __UDT_CHANNEL_H__
-
-
-#include "udt.h"
-#include "packet.h"
-
-
-class CChannel
-{
-public:
-   CChannel();
-   CChannel(int version);
-   ~CChannel();
-
-      // Functionality:
-      //    Open a UDP channel.
-      // Parameters:
-      //    0) [in] addr: The local address that UDP will use.
-      // Returned value:
-      //    None.
-
-   void open(const sockaddr* addr = NULL);
-
-      // Functionality:
-      //    Open a UDP channel based on an existing UDP socket.
-      // Parameters:
-      //    0) [in] udpsock: UDP socket descriptor.
-      // Returned value:
-      //    None.
-
-   void open(UDPSOCKET udpsock);
-
-      // Functionality:
-      //    Disconnect and close the UDP entity.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void close() const;
-
-      // Functionality:
-      //    Get the UDP sending buffer size.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Current UDP sending buffer size.
-
-   int getSndBufSize();
-
-      // Functionality:
-      //    Get the UDP receiving buffer size.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Current UDP receiving buffer size.
-
-   int getRcvBufSize();
-
-      // Functionality:
-      //    Set the UDP sending buffer size.
-      // Parameters:
-      //    0) [in] size: expected UDP sending buffer size.
-      // Returned value:
-      //    None.
-
-   void setSndBufSize(int size);
-
-      // Functionality:
-      //    Set the UDP receiving buffer size.
-      // Parameters:
-      //    0) [in] size: expected UDP receiving buffer size.
-      // Returned value:
-      //    None.
-
-   void setRcvBufSize(int size);
-
-      // Functionality:
-      //    Query the socket address that the channel is using.
-      // Parameters:
-      //    0) [out] addr: pointer to store the returned socket address.
-      // Returned value:
-      //    None.
-
-   void getSockAddr(sockaddr* addr) const;
-
-      // Functionality:
-      //    Query the peer side socket address that the channel is connect to.
-      // Parameters:
-      //    0) [out] addr: pointer to store the returned socket address.
-      // Returned value:
-      //    None.
-
-   void getPeerAddr(sockaddr* addr) const;
-
-      // Functionality:
-      //    Send a packet to the given address.
-      // Parameters:
-      //    0) [in] addr: pointer to the destination address.
-      //    1) [in] packet: reference to a CPacket entity.
-      // Returned value:
-      //    Actual size of data sent.
-
-   int sendto(const sockaddr* addr, CPacket& packet) const;
-
-      // Functionality:
-      //    Receive a packet from the channel and record the source address.
-      // Parameters:
-      //    0) [in] addr: pointer to the source address.
-      //    1) [in] packet: reference to a CPacket entity.
-      // Returned value:
-      //    Actual size of data received.
-
-   int recvfrom(sockaddr* addr, CPacket& packet) const;
-
-private:
-   void setUDPSockOpt();
-
-private:
-   int m_iIPversion;                    // IP version
-   int m_iSockAddrSize;                 // socket address structure size (pre-defined to avoid run-time test)
-
-   UDPSOCKET m_iSocket;                 // socket descriptor
-
-   int m_iSndBufSize;                   // UDP sending buffer size
-   int m_iRcvBufSize;                   // UDP receiving buffer size
-};
-
-
-#endif
diff --git a/vendor/udt4/src/common.cpp b/vendor/udt4/src/common.cpp
deleted file mode 100644
index 3b6ffda..0000000
--- a/vendor/udt4/src/common.cpp
+++ /dev/null
@@ -1,765 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2010, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 07/25/2010
-*****************************************************************************/
-
-
-#ifndef WIN32
-   #include <cstring>
-   #include <cerrno>
-   #include <unistd.h>
-   #ifdef OSX
-      #include <mach/mach_time.h>
-   #endif
-#else
-   #include <winsock2.h>
-   #include <ws2tcpip.h>
-   #ifdef LEGACY_WIN32
-      #include <wspiapi.h>
-   #endif
-#endif
-
-#include <cmath>
-#include "md5.h"
-#include "common.h"
-
-bool CTimer::m_bUseMicroSecond = false;
-uint64_t CTimer::s_ullCPUFrequency = CTimer::readCPUFrequency();
-#ifndef WIN32
-   pthread_mutex_t CTimer::m_EventLock = PTHREAD_MUTEX_INITIALIZER;
-   pthread_cond_t CTimer::m_EventCond = PTHREAD_COND_INITIALIZER;
-#else
-   pthread_mutex_t CTimer::m_EventLock = CreateMutex(NULL, false, NULL);
-   pthread_cond_t CTimer::m_EventCond = CreateEvent(NULL, false, false, NULL);
-#endif
-
-CTimer::CTimer():
-m_ullSchedTime(),
-m_TickCond(),
-m_TickLock()
-{
-   #ifndef WIN32
-      pthread_mutex_init(&m_TickLock, NULL);
-      pthread_cond_init(&m_TickCond, NULL);
-   #else
-      m_TickLock = CreateMutex(NULL, false, NULL);
-      m_TickCond = CreateEvent(NULL, false, false, NULL);
-   #endif
-}
-
-CTimer::~CTimer()
-{
-   #ifndef WIN32
-      pthread_mutex_destroy(&m_TickLock);
-      pthread_cond_destroy(&m_TickCond);
-   #else
-      CloseHandle(m_TickLock);
-      CloseHandle(m_TickCond);
-   #endif
-}
-
-void CTimer::rdtsc(uint64_t &x)
-{
-   if (m_bUseMicroSecond)
-   {
-      x = getTime();
-      return;
-   }
-
-   #ifdef IA32
-      uint32_t lval, hval;
-      //asm volatile ("push %eax; push %ebx; push %ecx; push %edx");
-      //asm volatile ("xor %eax, %eax; cpuid");
-      asm volatile ("rdtsc" : "=a" (lval), "=d" (hval));
-      //asm volatile ("pop %edx; pop %ecx; pop %ebx; pop %eax");
-      x = hval;
-      x = (x << 32) | lval;
-   #elif defined(IA64)
-      asm ("mov %0=ar.itc" : "=r"(x) :: "memory");
-   #elif defined(AMD64)
-      uint32_t lval, hval;
-      asm ("rdtsc" : "=a" (lval), "=d" (hval));
-      x = hval;
-      x = (x << 32) | lval;
-   #elif defined(WIN32)
-      //HANDLE hCurThread = ::GetCurrentThread(); 
-      //DWORD_PTR dwOldMask = ::SetThreadAffinityMask(hCurThread, 1); 
-      BOOL ret = QueryPerformanceCounter((LARGE_INTEGER *)&x);
-      //SetThreadAffinityMask(hCurThread, dwOldMask);
-      if (!ret)
-         x = getTime() * s_ullCPUFrequency;
-   #elif defined(OSX)
-      x = mach_absolute_time();
-   #else
-      // use system call to read time clock for other archs
-      x = getTime();
-   #endif
-}
-
-uint64_t CTimer::readCPUFrequency()
-{
-   uint64_t frequency = 1;  // 1 tick per microsecond.
-
-   #if defined(IA32) || defined(IA64) || defined(AMD64)
-      uint64_t t1, t2;
-
-      rdtsc(t1);
-      timespec ts;
-      ts.tv_sec = 0;
-      ts.tv_nsec = 100000000;
-      nanosleep(&ts, NULL);
-      rdtsc(t2);
-
-      // CPU clocks per microsecond
-      frequency = (t2 - t1) / 100000;
-   #elif defined(WIN32)
-      int64_t ccf;
-      if (QueryPerformanceFrequency((LARGE_INTEGER *)&ccf))
-         frequency = ccf / 1000000;
-   #elif defined(OSX)
-      mach_timebase_info_data_t info;
-      mach_timebase_info(&info);
-      frequency = info.denom * 1000ULL / info.numer;
-   #endif
-
-   // Fall back to microsecond if the resolution is not high enough.
-   if (frequency < 10)
-   {
-      frequency = 1;
-      m_bUseMicroSecond = true;
-   }
-   return frequency;
-}
-
-uint64_t CTimer::getCPUFrequency()
-{
-   return s_ullCPUFrequency;
-}
-
-void CTimer::sleep(uint64_t interval)
-{
-   uint64_t t;
-   rdtsc(t);
-
-   // sleep next "interval" time
-   sleepto(t + interval);
-}
-
-void CTimer::sleepto(uint64_t nexttime)
-{
-   // Use class member such that the method can be interrupted by others
-   m_ullSchedTime = nexttime;
-
-   uint64_t t;
-   rdtsc(t);
-
-   while (t < m_ullSchedTime)
-   {
-      #ifndef NO_BUSY_WAITING
-         #ifdef IA32
-            __asm__ volatile ("pause; rep; nop; nop; nop; nop; nop;");
-         #elif IA64
-            __asm__ volatile ("nop 0; nop 0; nop 0; nop 0; nop 0;");
-         #elif AMD64
-            __asm__ volatile ("nop; nop; nop; nop; nop;");
-         #endif
-      #else
-         #ifndef WIN32
-            timeval now;
-            timespec timeout;
-            gettimeofday(&now, 0);
-            if (now.tv_usec < 990000)
-            {
-               timeout.tv_sec = now.tv_sec;
-               timeout.tv_nsec = (now.tv_usec + 10000) * 1000;
-            }
-            else
-            {
-               timeout.tv_sec = now.tv_sec + 1;
-               timeout.tv_nsec = (now.tv_usec + 10000 - 1000000) * 1000;
-            }
-            pthread_mutex_lock(&m_TickLock);
-            pthread_cond_timedwait(&m_TickCond, &m_TickLock, &timeout);
-            pthread_mutex_unlock(&m_TickLock);
-         #else
-            WaitForSingleObject(m_TickCond, 1);
-         #endif
-      #endif
-
-      rdtsc(t);
-   }
-}
-
-void CTimer::interrupt()
-{
-   // schedule the sleepto time to the current CCs, so that it will stop
-   rdtsc(m_ullSchedTime);
-   tick();
-}
-
-void CTimer::tick()
-{
-   #ifndef WIN32
-      pthread_cond_signal(&m_TickCond);
-   #else
-      SetEvent(m_TickCond);
-   #endif
-}
-
-uint64_t CTimer::getTime()
-{
-   //For Cygwin and other systems without microsecond level resolution, uncomment the following three lines
-   //uint64_t x;
-   //rdtsc(x);
-   //return x / s_ullCPUFrequency;
-   //Specific fix may be necessary if rdtsc is not available either.
-
-   #ifndef WIN32
-      timeval t;
-      gettimeofday(&t, 0);
-      return t.tv_sec * 1000000ULL + t.tv_usec;
-   #else
-      LARGE_INTEGER ccf;
-      HANDLE hCurThread = ::GetCurrentThread(); 
-      DWORD_PTR dwOldMask = ::SetThreadAffinityMask(hCurThread, 1);
-      if (QueryPerformanceFrequency(&ccf))
-      {
-         LARGE_INTEGER cc;
-         if (QueryPerformanceCounter(&cc))
-         {
-            SetThreadAffinityMask(hCurThread, dwOldMask); 
-            return (cc.QuadPart * 1000000ULL / ccf.QuadPart);
-         }
-      }
-
-      SetThreadAffinityMask(hCurThread, dwOldMask); 
-      return GetTickCount() * 1000ULL;
-   #endif
-}
-
-void CTimer::triggerEvent()
-{
-   #ifndef WIN32
-      pthread_cond_signal(&m_EventCond);
-   #else
-      SetEvent(m_EventCond);
-   #endif
-}
-
-void CTimer::waitForEvent()
-{
-   #ifndef WIN32
-      timeval now;
-      timespec timeout;
-      gettimeofday(&now, 0);
-      if (now.tv_usec < 990000)
-      {
-         timeout.tv_sec = now.tv_sec;
-         timeout.tv_nsec = (now.tv_usec + 10000) * 1000;
-      }
-      else
-      {
-         timeout.tv_sec = now.tv_sec + 1;
-         timeout.tv_nsec = (now.tv_usec + 10000 - 1000000) * 1000;
-      }
-      pthread_mutex_lock(&m_EventLock);
-      pthread_cond_timedwait(&m_EventCond, &m_EventLock, &timeout);
-      pthread_mutex_unlock(&m_EventLock);
-   #else
-      WaitForSingleObject(m_EventCond, 1);
-   #endif
-}
-
-void CTimer::sleep()
-{
-   #ifndef WIN32
-      usleep(10);
-   #else
-      Sleep(1);
-   #endif
-}
-
-
-//
-// Automatically lock in constructor
-CGuard::CGuard(pthread_mutex_t& lock):
-m_Mutex(lock),
-m_iLocked()
-{
-   #ifndef WIN32
-      m_iLocked = pthread_mutex_lock(&m_Mutex);
-   #else
-      m_iLocked = WaitForSingleObject(m_Mutex, INFINITE);
-   #endif
-}
-
-// Automatically unlock in destructor
-CGuard::~CGuard()
-{
-   #ifndef WIN32
-      if (0 == m_iLocked)
-         pthread_mutex_unlock(&m_Mutex);
-   #else
-      if (WAIT_FAILED != m_iLocked)
-         ReleaseMutex(m_Mutex);
-   #endif
-}
-
-void CGuard::enterCS(pthread_mutex_t& lock)
-{
-   #ifndef WIN32
-      pthread_mutex_lock(&lock);
-   #else
-      WaitForSingleObject(lock, INFINITE);
-   #endif
-}
-
-void CGuard::leaveCS(pthread_mutex_t& lock)
-{
-   #ifndef WIN32
-      pthread_mutex_unlock(&lock);
-   #else
-      ReleaseMutex(lock);
-   #endif
-}
-
-void CGuard::createMutex(pthread_mutex_t& lock)
-{
-   #ifndef WIN32
-      pthread_mutex_init(&lock, NULL);
-   #else
-      lock = CreateMutex(NULL, false, NULL);
-   #endif
-}
-
-void CGuard::releaseMutex(pthread_mutex_t& lock)
-{
-   #ifndef WIN32
-      pthread_mutex_destroy(&lock);
-   #else
-      CloseHandle(lock);
-   #endif
-}
-
-void CGuard::createCond(pthread_cond_t& cond)
-{
-   #ifndef WIN32
-      pthread_cond_init(&cond, NULL);
-   #else
-      cond = CreateEvent(NULL, false, false, NULL);
-   #endif
-}
-
-void CGuard::releaseCond(pthread_cond_t& cond)
-{
-   #ifndef WIN32
-      pthread_cond_destroy(&cond);
-   #else
-      CloseHandle(cond);
-   #endif
-
-}
-
-//
-CUDTException::CUDTException(int major, int minor, int err):
-m_iMajor(major),
-m_iMinor(minor)
-{
-   if (-1 == err)
-      #ifndef WIN32
-         m_iErrno = errno;
-      #else
-         m_iErrno = GetLastError();
-      #endif
-   else
-      m_iErrno = err;
-}
-
-CUDTException::CUDTException(const CUDTException& e):
-m_iMajor(e.m_iMajor),
-m_iMinor(e.m_iMinor),
-m_iErrno(e.m_iErrno),
-m_strMsg()
-{
-}
-
-CUDTException::~CUDTException()
-{
-}
-
-const char* CUDTException::getErrorMessage()
-{
-   // translate "Major:Minor" code into text message.
-
-   switch (m_iMajor)
-   {
-      case 0:
-        m_strMsg = "Success";
-        break;
-
-      case 1:
-        m_strMsg = "Connection setup failure";
-
-        switch (m_iMinor)
-        {
-        case 1:
-           m_strMsg += ": connection time out";
-           break;
-
-        case 2:
-           m_strMsg += ": connection rejected";
-           break;
-
-        case 3:
-           m_strMsg += ": unable to create/configure UDP socket";
-           break;
-
-        case 4:
-           m_strMsg += ": abort for security reasons";
-           break;
-
-        default:
-           break;
-        }
-
-        break;
-
-      case 2:
-        switch (m_iMinor)
-        {
-        case 1:
-           m_strMsg = "Connection was broken";
-           break;
-
-        case 2:
-           m_strMsg = "Connection does not exist";
-           break;
-
-        default:
-           break;
-        }
-
-        break;
-
-      case 3:
-        m_strMsg = "System resource failure";
-
-        switch (m_iMinor)
-        {
-        case 1:
-           m_strMsg += ": unable to create new threads";
-           break;
-
-        case 2:
-           m_strMsg += ": unable to allocate buffers";
-           break;
-
-        default:
-           break;
-        }
-
-        break;
-
-      case 4:
-        m_strMsg = "File system failure";
-
-        switch (m_iMinor)
-        {
-        case 1:
-           m_strMsg += ": cannot seek read position";
-           break;
-
-        case 2:
-           m_strMsg += ": failure in read";
-           break;
-
-        case 3:
-           m_strMsg += ": cannot seek write position";
-           break;
-
-        case 4:
-           m_strMsg += ": failure in write";
-           break;
-
-        default:
-           break;
-        }
-
-        break;
-
-      case 5:
-        m_strMsg = "Operation not supported";
- 
-        switch (m_iMinor)
-        {
-        case 1:
-           m_strMsg += ": Cannot do this operation on a BOUND socket";
-           break;
-
-        case 2:
-           m_strMsg += ": Cannot do this operation on a CONNECTED socket";
-           break;
-
-        case 3:
-           m_strMsg += ": Bad parameters";
-           break;
-
-        case 4:
-           m_strMsg += ": Invalid socket ID";
-           break;
-
-        case 5:
-           m_strMsg += ": Cannot do this operation on an UNBOUND socket";
-           break;
-
-        case 6:
-           m_strMsg += ": Socket is not in listening state";
-           break;
-
-        case 7:
-           m_strMsg += ": Listen/accept is not supported in rendezous connection setup";
-           break;
-
-        case 8:
-           m_strMsg += ": Cannot call connect on UNBOUND socket in rendezvous connection setup";
-           break;
-
-        case 9:
-           m_strMsg += ": This operation is not supported in SOCK_STREAM mode";
-           break;
-
-        case 10:
-           m_strMsg += ": This operation is not supported in SOCK_DGRAM mode";
-           break;
-
-        case 11:
-           m_strMsg += ": Another socket is already listening on the same port";
-           break;
-
-        case 12:
-           m_strMsg += ": Message is too large to send (it must be less than the UDT send buffer size)";
-           break;
-
-        case 13:
-           m_strMsg += ": Invalid epoll ID";
-           break;
-
-        default:
-           break;
-        }
-
-        break;
-
-     case 6:
-        m_strMsg = "Non-blocking call failure";
-
-        switch (m_iMinor)
-        {
-        case 1:
-           m_strMsg += ": no buffer available for sending";
-           break;
-
-        case 2:
-           m_strMsg += ": no data available for reading";
-           break;
-
-        default:
-           break;
-        }
-
-        break;
-
-     case 7:
-        m_strMsg = "The peer side has signalled an error";
-
-        break;
-
-      default:
-        m_strMsg = "Unknown error";
-   }
-
-   // Adding "errno" information
-   if ((0 != m_iMajor) && (0 < m_iErrno))
-   {
-      m_strMsg += ": ";
-      #ifndef WIN32
-         char errmsg[1024];
-         if (strerror_r(m_iErrno, errmsg, 1024) == 0)
-            m_strMsg += errmsg;
-      #else
-         LPVOID lpMsgBuf;
-         FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, NULL, m_iErrno, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR)&lpMsgBuf, 0, NULL);
-         m_strMsg += (char*)lpMsgBuf;
-         LocalFree(lpMsgBuf);
-      #endif
-   }
-
-   // period
-   #ifndef WIN32
-      m_strMsg += ".";
-   #endif
-
-   return m_strMsg.c_str();
-}
-
-int CUDTException::getErrorCode() const
-{
-   return m_iMajor * 1000 + m_iMinor;
-}
-
-void CUDTException::clear()
-{
-   m_iMajor = 0;
-   m_iMinor = 0;
-   m_iErrno = 0;
-}
-
-const int CUDTException::SUCCESS = 0;
-const int CUDTException::ECONNSETUP = 1000;
-const int CUDTException::ENOSERVER = 1001;
-const int CUDTException::ECONNREJ = 1002;
-const int CUDTException::ESOCKFAIL = 1003;
-const int CUDTException::ESECFAIL = 1004;
-const int CUDTException::ECONNFAIL = 2000;
-const int CUDTException::ECONNLOST = 2001;
-const int CUDTException::ENOCONN = 2002;
-const int CUDTException::ERESOURCE = 3000;
-const int CUDTException::ETHREAD = 3001;
-const int CUDTException::ENOBUF = 3002;
-const int CUDTException::EFILE = 4000;
-const int CUDTException::EINVRDOFF = 4001;
-const int CUDTException::ERDPERM = 4002;
-const int CUDTException::EINVWROFF = 4003;
-const int CUDTException::EWRPERM = 4004;
-const int CUDTException::EINVOP = 5000;
-const int CUDTException::EBOUNDSOCK = 5001;
-const int CUDTException::ECONNSOCK = 5002;
-const int CUDTException::EINVPARAM = 5003;
-const int CUDTException::EINVSOCK = 5004;
-const int CUDTException::EUNBOUNDSOCK = 5005;
-const int CUDTException::ENOLISTEN = 5006;
-const int CUDTException::ERDVNOSERV = 5007;
-const int CUDTException::ERDVUNBOUND = 5008;
-const int CUDTException::ESTREAMILL = 5009;
-const int CUDTException::EDGRAMILL = 5010;
-const int CUDTException::EDUPLISTEN = 5011;
-const int CUDTException::ELARGEMSG = 5012;
-const int CUDTException::EINVPOLLID = 5013;
-const int CUDTException::EASYNCFAIL = 6000;
-const int CUDTException::EASYNCSND = 6001;
-const int CUDTException::EASYNCRCV = 6002;
-const int CUDTException::ETIMEOUT = 6003;
-const int CUDTException::EPEERERR = 7000;
-const int CUDTException::EUNKNOWN = -1;
-
-
-//
-bool CIPAddress::ipcmp(const sockaddr* addr1, const sockaddr* addr2, int ver)
-{
-   if (AF_INET == ver)
-   {
-      sockaddr_in* a1 = (sockaddr_in*)addr1;
-      sockaddr_in* a2 = (sockaddr_in*)addr2;
-
-      if ((a1->sin_port == a2->sin_port) && (a1->sin_addr.s_addr == a2->sin_addr.s_addr))
-         return true;
-   }
-   else
-   {
-      sockaddr_in6* a1 = (sockaddr_in6*)addr1;
-      sockaddr_in6* a2 = (sockaddr_in6*)addr2;
-
-      if (a1->sin6_port == a2->sin6_port)
-      {
-         for (int i = 0; i < 16; ++ i)
-            if (*((char*)&(a1->sin6_addr) + i) != *((char*)&(a2->sin6_addr) + i))
-               return false;
-
-         return true;
-      }
-   }
-
-   return false;
-}
-
-void CIPAddress::ntop(const sockaddr* addr, uint32_t ip[4], int ver)
-{
-   if (AF_INET == ver)
-   {
-      sockaddr_in* a = (sockaddr_in*)addr;
-      ip[0] = a->sin_addr.s_addr;
-   }
-   else
-   {
-      sockaddr_in6* a = (sockaddr_in6*)addr;
-      ip[3] = (a->sin6_addr.s6_addr[15] << 24) + (a->sin6_addr.s6_addr[14] << 16) + (a->sin6_addr.s6_addr[13] << 8) + a->sin6_addr.s6_addr[12];
-      ip[2] = (a->sin6_addr.s6_addr[11] << 24) + (a->sin6_addr.s6_addr[10] << 16) + (a->sin6_addr.s6_addr[9] << 8) + a->sin6_addr.s6_addr[8];
-      ip[1] = (a->sin6_addr.s6_addr[7] << 24) + (a->sin6_addr.s6_addr[6] << 16) + (a->sin6_addr.s6_addr[5] << 8) + a->sin6_addr.s6_addr[4];
-      ip[0] = (a->sin6_addr.s6_addr[3] << 24) + (a->sin6_addr.s6_addr[2] << 16) + (a->sin6_addr.s6_addr[1] << 8) + a->sin6_addr.s6_addr[0];
-   }
-}
-
-void CIPAddress::pton(sockaddr* addr, const uint32_t ip[4], int ver)
-{
-   if (AF_INET == ver)
-   {
-      sockaddr_in* a = (sockaddr_in*)addr;
-      a->sin_addr.s_addr = ip[0];
-   }
-   else
-   {
-      sockaddr_in6* a = (sockaddr_in6*)addr;
-      for (int i = 0; i < 4; ++ i)
-      {
-         a->sin6_addr.s6_addr[i * 4] = ip[i] & 0xFF;
-         a->sin6_addr.s6_addr[i * 4 + 1] = (unsigned char)((ip[i] & 0xFF00) >> 8);
-         a->sin6_addr.s6_addr[i * 4 + 2] = (unsigned char)((ip[i] & 0xFF0000) >> 16);
-         a->sin6_addr.s6_addr[i * 4 + 3] = (unsigned char)((ip[i] & 0xFF000000) >> 24);
-      }
-   }
-}
-
-//
-void CMD5::compute(const char* input, unsigned char result[16])
-{
-   md5_state_t state;
-
-   md5_init(&state);
-   md5_append(&state, (const md5_byte_t *)input, strlen(input));
-   md5_finish(&state, result);
-}
diff --git a/vendor/udt4/src/common.h b/vendor/udt4/src/common.h
deleted file mode 100644
index 20c0bb4..0000000
--- a/vendor/udt4/src/common.h
+++ /dev/null
@@ -1,321 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2009, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 08/01/2009
-*****************************************************************************/
-
-#ifndef __UDT_COMMON_H__
-#define __UDT_COMMON_H__
-
-
-#ifndef WIN32
-   #include <sys/time.h>
-   #include <sys/uio.h>
-   #include <pthread.h>
-#else
-   #include <windows.h>
-#endif
-#include <cstdlib>
-#include <stdint.h>
-#include "udt.h"
-
-
-#ifdef WIN32
-   // Windows compability
-   typedef HANDLE pthread_t;
-   typedef HANDLE pthread_mutex_t;
-   typedef HANDLE pthread_cond_t;
-   typedef DWORD pthread_key_t;
-#endif
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-class CTimer
-{
-public:
-   CTimer();
-   ~CTimer();
-
-public:
-
-      // Functionality:
-      //    Sleep for "interval" CCs.
-      // Parameters:
-      //    0) [in] interval: CCs to sleep.
-      // Returned value:
-      //    None.
-
-   void sleep(uint64_t interval);
-
-      // Functionality:
-      //    Seelp until CC "nexttime".
-      // Parameters:
-      //    0) [in] nexttime: next time the caller is waken up.
-      // Returned value:
-      //    None.
-
-   void sleepto(uint64_t nexttime);
-
-      // Functionality:
-      //    Stop the sleep() or sleepto() methods.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void interrupt();
-
-      // Functionality:
-      //    trigger the clock for a tick, for better granuality in no_busy_waiting timer.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void tick();
-
-public:
-
-      // Functionality:
-      //    Read the CPU clock cycle into x.
-      // Parameters:
-      //    0) [out] x: to record cpu clock cycles.
-      // Returned value:
-      //    None.
-
-   static void rdtsc(uint64_t &x);
-
-      // Functionality:
-      //    return the CPU frequency.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    CPU frequency.
-
-   static uint64_t getCPUFrequency();
-
-      // Functionality:
-      //    check the current time, 64bit, in microseconds.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    current time in microseconds.
-
-   static uint64_t getTime();
-
-      // Functionality:
-      //    trigger an event such as new connection, close, new data, etc. for "select" call.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   static void triggerEvent();
-
-      // Functionality:
-      //    wait for an event to br triggered by "triggerEvent".
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   static void waitForEvent();
-
-      // Functionality:
-      //    sleep for a short interval. exact sleep time does not matter
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   static void sleep();
-
-private:
-   uint64_t getTimeInMicroSec();
-
-private:
-   uint64_t m_ullSchedTime;             // next schedulled time
-
-   pthread_cond_t m_TickCond;
-   pthread_mutex_t m_TickLock;
-
-   static pthread_cond_t m_EventCond;
-   static pthread_mutex_t m_EventLock;
-
-private:
-   static uint64_t s_ullCPUFrequency;	// CPU frequency : clock cycles per microsecond
-   static uint64_t readCPUFrequency();
-   static bool m_bUseMicroSecond;       // No higher resolution timer available, use gettimeofday().
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class CGuard
-{
-public:
-   CGuard(pthread_mutex_t& lock);
-   ~CGuard();
-
-public:
-   static void enterCS(pthread_mutex_t& lock);
-   static void leaveCS(pthread_mutex_t& lock);
-
-   static void createMutex(pthread_mutex_t& lock);
-   static void releaseMutex(pthread_mutex_t& lock);
-
-   static void createCond(pthread_cond_t& cond);
-   static void releaseCond(pthread_cond_t& cond);
-
-private:
-   pthread_mutex_t& m_Mutex;            // Alias name of the mutex to be protected
-   int m_iLocked;                       // Locking status
-
-   CGuard& operator=(const CGuard&);
-};
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-// UDT Sequence Number 0 - (2^31 - 1)
-
-// seqcmp: compare two seq#, considering the wraping
-// seqlen: length from the 1st to the 2nd seq#, including both
-// seqoff: offset from the 2nd to the 1st seq#
-// incseq: increase the seq# by 1
-// decseq: decrease the seq# by 1
-// incseq: increase the seq# by a given offset
-
-class CSeqNo
-{
-public:
-   inline static int seqcmp(int32_t seq1, int32_t seq2)
-   {return (abs(seq1 - seq2) < m_iSeqNoTH) ? (seq1 - seq2) : (seq2 - seq1);}
-
-   inline static int seqlen(int32_t seq1, int32_t seq2)
-   {return (seq1 <= seq2) ? (seq2 - seq1 + 1) : (seq2 - seq1 + m_iMaxSeqNo + 2);}
-
-   inline static int seqoff(int32_t seq1, int32_t seq2)
-   {
-      if (abs(seq1 - seq2) < m_iSeqNoTH)
-         return seq2 - seq1;
-
-      if (seq1 < seq2)
-         return seq2 - seq1 - m_iMaxSeqNo - 1;
-
-      return seq2 - seq1 + m_iMaxSeqNo + 1;
-   }
-
-   inline static int32_t incseq(int32_t seq)
-   {return (seq == m_iMaxSeqNo) ? 0 : seq + 1;}
-
-   inline static int32_t decseq(int32_t seq)
-   {return (seq == 0) ? m_iMaxSeqNo : seq - 1;}
-
-   inline static int32_t incseq(int32_t seq, int32_t inc)
-   {return (m_iMaxSeqNo - seq >= inc) ? seq + inc : seq - m_iMaxSeqNo + inc - 1;}
-
-public:
-   static const int32_t m_iSeqNoTH;             // threshold for comparing seq. no.
-   static const int32_t m_iMaxSeqNo;            // maximum sequence number used in UDT
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-// UDT ACK Sub-sequence Number: 0 - (2^31 - 1)
-
-class CAckNo
-{
-public:
-   inline static int32_t incack(int32_t ackno)
-   {return (ackno == m_iMaxAckSeqNo) ? 0 : ackno + 1;}
-
-public:
-   static const int32_t m_iMaxAckSeqNo;         // maximum ACK sub-sequence number used in UDT
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-// UDT Message Number: 0 - (2^29 - 1)
-
-class CMsgNo
-{
-public:
-   inline static int msgcmp(int32_t msgno1, int32_t msgno2)
-   {return (abs(msgno1 - msgno2) < m_iMsgNoTH) ? (msgno1 - msgno2) : (msgno2 - msgno1);}
-
-   inline static int msglen(int32_t msgno1, int32_t msgno2)
-   {return (msgno1 <= msgno2) ? (msgno2 - msgno1 + 1) : (msgno2 - msgno1 + m_iMaxMsgNo + 2);}
-
-   inline static int msgoff(int32_t msgno1, int32_t msgno2)
-   {
-      if (abs(msgno1 - msgno2) < m_iMsgNoTH)
-         return msgno2 - msgno1;
-
-      if (msgno1 < msgno2)
-         return msgno2 - msgno1 - m_iMaxMsgNo - 1;
-
-      return msgno2 - msgno1 + m_iMaxMsgNo + 1;
-   }
-
-   inline static int32_t incmsg(int32_t msgno)
-   {return (msgno == m_iMaxMsgNo) ? 0 : msgno + 1;}
-
-public:
-   static const int32_t m_iMsgNoTH;             // threshold for comparing msg. no.
-   static const int32_t m_iMaxMsgNo;            // maximum message number used in UDT
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-struct CIPAddress
-{
-   static bool ipcmp(const sockaddr* addr1, const sockaddr* addr2, int ver = AF_INET);
-   static void ntop(const sockaddr* addr, uint32_t ip[4], int ver = AF_INET);
-   static void pton(sockaddr* addr, const uint32_t ip[4], int ver = AF_INET);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-struct CMD5
-{
-   static void compute(const char* input, unsigned char result[16]);
-};
-
-
-#endif
diff --git a/vendor/udt4/src/core.cpp b/vendor/udt4/src/core.cpp
deleted file mode 100644
index ba989aa..0000000
--- a/vendor/udt4/src/core.cpp
+++ /dev/null
@@ -1,2675 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 02/28/2012
-*****************************************************************************/
-
-#ifndef WIN32
-   #include <unistd.h>
-   #include <netdb.h>
-   #include <arpa/inet.h>
-   #include <cerrno>
-   #include <cstring>
-   #include <cstdlib>
-#else
-   #include <winsock2.h>
-   #include <ws2tcpip.h>
-   #ifdef LEGACY_WIN32
-      #include <wspiapi.h>
-   #endif
-#endif
-#include <cmath>
-#include <sstream>
-#include "queue.h"
-#include "core.h"
-
-using namespace std;
-
-
-CUDTUnited CUDT::s_UDTUnited;
-
-const UDTSOCKET CUDT::INVALID_SOCK = -1;
-const int CUDT::ERROR = -1;
-
-const UDTSOCKET UDT::INVALID_SOCK = CUDT::INVALID_SOCK;
-const int UDT::ERROR = CUDT::ERROR;
-
-const int32_t CSeqNo::m_iSeqNoTH = 0x3FFFFFFF;
-const int32_t CSeqNo::m_iMaxSeqNo = 0x7FFFFFFF;
-const int32_t CAckNo::m_iMaxAckSeqNo = 0x7FFFFFFF;
-const int32_t CMsgNo::m_iMsgNoTH = 0xFFFFFFF;
-const int32_t CMsgNo::m_iMaxMsgNo = 0x1FFFFFFF;
-
-const int CUDT::m_iVersion = 4;
-const int CUDT::m_iSYNInterval = 10000;
-const int CUDT::m_iSelfClockInterval = 64;
-
-
-CUDT::CUDT()
-{
-   m_pSndBuffer = NULL;
-   m_pRcvBuffer = NULL;
-   m_pSndLossList = NULL;
-   m_pRcvLossList = NULL;
-   m_pACKWindow = NULL;
-   m_pSndTimeWindow = NULL;
-   m_pRcvTimeWindow = NULL;
-
-   m_pSndQueue = NULL;
-   m_pRcvQueue = NULL;
-   m_pPeerAddr = NULL;
-   m_pSNode = NULL;
-   m_pRNode = NULL;
-
-   // Initilize mutex and condition variables
-   initSynch();
-
-   // Default UDT configurations
-   m_iMSS = 1500;
-   m_bSynSending = true;
-   m_bSynRecving = true;
-   m_iFlightFlagSize = 25600;
-   m_iSndBufSize = 8192;
-   m_iRcvBufSize = 8192; //Rcv buffer MUST NOT be bigger than Flight Flag size
-   m_Linger.l_onoff = 1;
-   m_Linger.l_linger = 180;
-   m_iUDPSndBufSize = 65536;
-   m_iUDPRcvBufSize = m_iRcvBufSize * m_iMSS;
-   m_iSockType = UDT_STREAM;
-   m_iIPversion = AF_INET;
-   m_bRendezvous = false;
-   m_iSndTimeOut = -1;
-   m_iRcvTimeOut = -1;
-   m_bReuseAddr = true;
-   m_llMaxBW = -1;
-
-   m_pCCFactory = new CCCFactory<CUDTCC>;
-   m_pCC = NULL;
-   m_pCache = NULL;
-
-   // Initial status
-   m_bOpened = false;
-   m_bListening = false;
-   m_bConnecting = false;
-   m_bConnected = false;
-   m_bClosing = false;
-   m_bShutdown = false;
-   m_bBroken = false;
-   m_bPeerHealth = true;
-   m_ullLingerExpiration = 0;
-}
-
-CUDT::CUDT(const CUDT& ancestor)
-{
-   m_pSndBuffer = NULL;
-   m_pRcvBuffer = NULL;
-   m_pSndLossList = NULL;
-   m_pRcvLossList = NULL;
-   m_pACKWindow = NULL;
-   m_pSndTimeWindow = NULL;
-   m_pRcvTimeWindow = NULL;
-
-   m_pSndQueue = NULL;
-   m_pRcvQueue = NULL;
-   m_pPeerAddr = NULL;
-   m_pSNode = NULL;
-   m_pRNode = NULL;
-
-   // Initilize mutex and condition variables
-   initSynch();
-
-   // Default UDT configurations
-   m_iMSS = ancestor.m_iMSS;
-   m_bSynSending = ancestor.m_bSynSending;
-   m_bSynRecving = ancestor.m_bSynRecving;
-   m_iFlightFlagSize = ancestor.m_iFlightFlagSize;
-   m_iSndBufSize = ancestor.m_iSndBufSize;
-   m_iRcvBufSize = ancestor.m_iRcvBufSize;
-   m_Linger = ancestor.m_Linger;
-   m_iUDPSndBufSize = ancestor.m_iUDPSndBufSize;
-   m_iUDPRcvBufSize = ancestor.m_iUDPRcvBufSize;
-   m_iSockType = ancestor.m_iSockType;
-   m_iIPversion = ancestor.m_iIPversion;
-   m_bRendezvous = ancestor.m_bRendezvous;
-   m_iSndTimeOut = ancestor.m_iSndTimeOut;
-   m_iRcvTimeOut = ancestor.m_iRcvTimeOut;
-   m_bReuseAddr = true;	// this must be true, because all accepted sockets shared the same port with the listener
-   m_llMaxBW = ancestor.m_llMaxBW;
-
-   m_pCCFactory = ancestor.m_pCCFactory->clone();
-   m_pCC = NULL;
-   m_pCache = ancestor.m_pCache;
-
-   // Initial status
-   m_bOpened = false;
-   m_bListening = false;
-   m_bConnecting = false;
-   m_bConnected = false;
-   m_bClosing = false;
-   m_bShutdown = false;
-   m_bBroken = false;
-   m_bPeerHealth = true;
-   m_ullLingerExpiration = 0;
-}
-
-CUDT::~CUDT()
-{
-   // release mutex/condtion variables
-   destroySynch();
-
-   // destroy the data structures
-   delete m_pSndBuffer;
-   delete m_pRcvBuffer;
-   delete m_pSndLossList;
-   delete m_pRcvLossList;
-   delete m_pACKWindow;
-   delete m_pSndTimeWindow;
-   delete m_pRcvTimeWindow;
-   delete m_pCCFactory;
-   delete m_pCC;
-   delete m_pPeerAddr;
-   delete m_pSNode;
-   delete m_pRNode;
-}
-
-void CUDT::setOpt(UDTOpt optName, const void* optval, int)
-{
-   if (m_bBroken || m_bClosing)
-      throw CUDTException(2, 1, 0);
-
-   CGuard cg(m_ConnectionLock);
-   CGuard sendguard(m_SendLock);
-   CGuard recvguard(m_RecvLock);
-
-   switch (optName)
-   {
-   case UDT_MSS:
-      if (m_bOpened)
-         throw CUDTException(5, 1, 0);
-
-      if (*(int*)optval < int(28 + CHandShake::m_iContentSize))
-         throw CUDTException(5, 3, 0);
-
-      m_iMSS = *(int*)optval;
-
-      // Packet size cannot be greater than UDP buffer size
-      if (m_iMSS > m_iUDPSndBufSize)
-         m_iMSS = m_iUDPSndBufSize;
-      if (m_iMSS > m_iUDPRcvBufSize)
-         m_iMSS = m_iUDPRcvBufSize;
-
-      break;
-
-   case UDT_SNDSYN:
-      m_bSynSending = *(bool *)optval;
-      break;
-
-   case UDT_RCVSYN:
-      m_bSynRecving = *(bool *)optval;
-      break;
-
-   case UDT_CC:
-      if (m_bConnecting || m_bConnected)
-         throw CUDTException(5, 1, 0);
-      if (NULL != m_pCCFactory)
-         delete m_pCCFactory;
-      m_pCCFactory = ((CCCVirtualFactory *)optval)->clone();
-
-      break;
-
-   case UDT_FC:
-      if (m_bConnecting || m_bConnected)
-         throw CUDTException(5, 2, 0);
-
-      if (*(int*)optval < 1)
-         throw CUDTException(5, 3);
-
-      // Mimimum recv flight flag size is 32 packets
-      if (*(int*)optval > 32)
-         m_iFlightFlagSize = *(int*)optval;
-      else
-         m_iFlightFlagSize = 32;
-
-      break;
-
-   case UDT_SNDBUF:
-      if (m_bOpened)
-         throw CUDTException(5, 1, 0);
-
-      if (*(int*)optval <= 0)
-         throw CUDTException(5, 3, 0);
-
-      m_iSndBufSize = *(int*)optval / (m_iMSS - 28);
-
-      break;
-
-   case UDT_RCVBUF:
-      if (m_bOpened)
-         throw CUDTException(5, 1, 0);
-
-      if (*(int*)optval <= 0)
-         throw CUDTException(5, 3, 0);
-
-      // Mimimum recv buffer size is 32 packets
-      if (*(int*)optval > (m_iMSS - 28) * 32)
-         m_iRcvBufSize = *(int*)optval / (m_iMSS - 28);
-      else
-         m_iRcvBufSize = 32;
-
-      // recv buffer MUST not be greater than FC size
-      if (m_iRcvBufSize > m_iFlightFlagSize)
-         m_iRcvBufSize = m_iFlightFlagSize;
-
-      break;
-
-   case UDT_LINGER:
-      m_Linger = *(linger*)optval;
-      break;
-
-   case UDP_SNDBUF:
-      if (m_bOpened)
-         throw CUDTException(5, 1, 0);
-
-      m_iUDPSndBufSize = *(int*)optval;
-
-      if (m_iUDPSndBufSize < m_iMSS)
-         m_iUDPSndBufSize = m_iMSS;
-
-      break;
-
-   case UDP_RCVBUF:
-      if (m_bOpened)
-         throw CUDTException(5, 1, 0);
-
-      m_iUDPRcvBufSize = *(int*)optval;
-
-      if (m_iUDPRcvBufSize < m_iMSS)
-         m_iUDPRcvBufSize = m_iMSS;
-
-      break;
-
-   case UDT_RENDEZVOUS:
-      if (m_bConnecting || m_bConnected)
-         throw CUDTException(5, 1, 0);
-      m_bRendezvous = *(bool *)optval;
-      break;
-
-   case UDT_SNDTIMEO: 
-      m_iSndTimeOut = *(int*)optval; 
-      break; 
-    
-   case UDT_RCVTIMEO: 
-      m_iRcvTimeOut = *(int*)optval; 
-      break; 
-
-   case UDT_REUSEADDR:
-      if (m_bOpened)
-         throw CUDTException(5, 1, 0);
-      m_bReuseAddr = *(bool*)optval;
-      break;
-
-   case UDT_MAXBW:
-      m_llMaxBW = *(int64_t*)optval;
-      break;
-    
-   default:
-      throw CUDTException(5, 0, 0);
-   }
-}
-
-void CUDT::getOpt(UDTOpt optName, void* optval, int& optlen)
-{
-   CGuard cg(m_ConnectionLock);
-
-   switch (optName)
-   {
-   case UDT_MSS:
-      *(int*)optval = m_iMSS;
-      optlen = sizeof(int);
-      break;
-
-   case UDT_SNDSYN:
-      *(bool*)optval = m_bSynSending;
-      optlen = sizeof(bool);
-      break;
-
-   case UDT_RCVSYN:
-      *(bool*)optval = m_bSynRecving;
-      optlen = sizeof(bool);
-      break;
-
-   case UDT_CC:
-      if (!m_bOpened)
-         throw CUDTException(5, 5, 0);
-      *(CCC**)optval = m_pCC;
-      optlen = sizeof(CCC*);
-
-      break;
-
-   case UDT_FC:
-      *(int*)optval = m_iFlightFlagSize;
-      optlen = sizeof(int);
-      break;
-
-   case UDT_SNDBUF:
-      *(int*)optval = m_iSndBufSize * (m_iMSS - 28);
-      optlen = sizeof(int);
-      break;
-
-   case UDT_RCVBUF:
-      *(int*)optval = m_iRcvBufSize * (m_iMSS - 28);
-      optlen = sizeof(int);
-      break;
-
-   case UDT_LINGER:
-      if (optlen < (int)(sizeof(linger)))
-         throw CUDTException(5, 3, 0);
-
-      *(linger*)optval = m_Linger;
-      optlen = sizeof(linger);
-      break;
-
-   case UDP_SNDBUF:
-      *(int*)optval = m_iUDPSndBufSize;
-      optlen = sizeof(int);
-      break;
-
-   case UDP_RCVBUF:
-      *(int*)optval = m_iUDPRcvBufSize;
-      optlen = sizeof(int);
-      break;
-
-   case UDT_RENDEZVOUS:
-      *(bool *)optval = m_bRendezvous;
-      optlen = sizeof(bool);
-      break;
-
-   case UDT_SNDTIMEO: 
-      *(int*)optval = m_iSndTimeOut; 
-      optlen = sizeof(int); 
-      break; 
-    
-   case UDT_RCVTIMEO: 
-      *(int*)optval = m_iRcvTimeOut; 
-      optlen = sizeof(int); 
-      break; 
-
-   case UDT_REUSEADDR:
-      *(bool *)optval = m_bReuseAddr;
-      optlen = sizeof(bool);
-      break;
-
-   case UDT_MAXBW:
-      *(int64_t*)optval = m_llMaxBW;
-      optlen = sizeof(int64_t);
-      break;
-
-   case UDT_STATE:
-      *(int32_t*)optval = s_UDTUnited.getStatus(m_SocketID);
-      optlen = sizeof(int32_t);
-      break;
-
-   case UDT_EVENT:
-   {
-      int32_t event = 0;
-      if (m_bBroken)
-         event |= UDT_EPOLL_ERR;
-      else
-      {
-         if (m_pRcvBuffer && (m_pRcvBuffer->getRcvDataSize() > 0))
-            event |= UDT_EPOLL_IN;
-         if (m_pSndBuffer && (m_iSndBufSize > m_pSndBuffer->getCurrBufSize()))
-            event |= UDT_EPOLL_OUT;
-      }
-      *(int32_t*)optval = event;
-      optlen = sizeof(int32_t);
-      break;
-   }
-
-   case UDT_SNDDATA:
-      if (m_pSndBuffer)
-         *(int32_t*)optval = m_pSndBuffer->getCurrBufSize();
-      else
-         *(int32_t*)optval = 0;
-      optlen = sizeof(int32_t);
-      break;
-
-   case UDT_RCVDATA:
-      if (m_pRcvBuffer)
-         *(int32_t*)optval = m_pRcvBuffer->getRcvDataSize();
-      else
-         *(int32_t*)optval = 0;
-      optlen = sizeof(int32_t);
-      break;
-
-   default:
-      throw CUDTException(5, 0, 0);
-   }
-}
-
-void CUDT::open()
-{
-   CGuard cg(m_ConnectionLock);
-
-   // Initial sequence number, loss, acknowledgement, etc.
-   m_iPktSize = m_iMSS - 28;
-   m_iPayloadSize = m_iPktSize - CPacket::m_iPktHdrSize;
-
-   m_iEXPCount = 1;
-   m_iBandwidth = 1;
-   m_iDeliveryRate = 16;
-   m_iAckSeqNo = 0;
-   m_ullLastAckTime = 0;
-
-   // trace information
-   m_StartTime = CTimer::getTime();
-   m_llSentTotal = m_llRecvTotal = m_iSndLossTotal = m_iRcvLossTotal = m_iRetransTotal = m_iSentACKTotal = m_iRecvACKTotal = m_iSentNAKTotal = m_iRecvNAKTotal = 0;
-   m_LastSampleTime = CTimer::getTime();
-   m_llTraceSent = m_llTraceRecv = m_iTraceSndLoss = m_iTraceRcvLoss = m_iTraceRetrans = m_iSentACK = m_iRecvACK = m_iSentNAK = m_iRecvNAK = 0;
-   m_llSndDuration = m_llSndDurationTotal = 0;
-
-   // structures for queue
-   if (NULL == m_pSNode)
-      m_pSNode = new CSNode;
-   m_pSNode->m_pUDT = this;
-   m_pSNode->m_llTimeStamp = 1;
-   m_pSNode->m_iHeapLoc = -1;
-
-   if (NULL == m_pRNode)
-      m_pRNode = new CRNode;
-   m_pRNode->m_pUDT = this;
-   m_pRNode->m_llTimeStamp = 1;
-   m_pRNode->m_pPrev = m_pRNode->m_pNext = NULL;
-   m_pRNode->m_bOnList = false;
-
-   m_iRTT = 10 * m_iSYNInterval;
-   m_iRTTVar = m_iRTT >> 1;
-   m_ullCPUFrequency = CTimer::getCPUFrequency();
-
-   // set up the timers
-   m_ullSYNInt = m_iSYNInterval * m_ullCPUFrequency;
-  
-   // set minimum NAK and EXP timeout to 100ms
-   m_ullMinNakInt = 300000 * m_ullCPUFrequency;
-   m_ullMinExpInt = 300000 * m_ullCPUFrequency;
-
-   m_ullACKInt = m_ullSYNInt;
-   m_ullNAKInt = m_ullMinNakInt;
-
-   uint64_t currtime;
-   CTimer::rdtsc(currtime);
-   m_ullLastRspTime = currtime;
-   m_ullNextACKTime = currtime + m_ullSYNInt;
-   m_ullNextNAKTime = currtime + m_ullNAKInt;
-
-   m_iPktCount = 0;
-   m_iLightACKCount = 1;
-
-   m_ullTargetTime = 0;
-   m_ullTimeDiff = 0;
-
-   // Now UDT is opened.
-   m_bOpened = true;
-}
-
-void CUDT::listen()
-{
-   CGuard cg(m_ConnectionLock);
-
-   if (!m_bOpened)
-      throw CUDTException(5, 0, 0);
-
-   if (m_bConnecting || m_bConnected)
-      throw CUDTException(5, 2, 0);
-
-   // listen can be called more than once
-   if (m_bListening)
-      return;
-
-   // if there is already another socket listening on the same port
-   if (m_pRcvQueue->setListener(this) < 0)
-      throw CUDTException(5, 11, 0);
-
-   m_bListening = true;
-}
-
-void CUDT::connect(const sockaddr* serv_addr)
-{
-   CGuard cg(m_ConnectionLock);
-
-   if (!m_bOpened)
-      throw CUDTException(5, 0, 0);
-
-   if (m_bListening)
-      throw CUDTException(5, 2, 0);
-
-   if (m_bConnecting || m_bConnected)
-      throw CUDTException(5, 2, 0);
-
-   // record peer/server address
-   delete m_pPeerAddr;
-   m_pPeerAddr = (AF_INET == m_iIPversion) ? (sockaddr*)new sockaddr_in : (sockaddr*)new sockaddr_in6;
-   memcpy(m_pPeerAddr, serv_addr, (AF_INET == m_iIPversion) ? sizeof(sockaddr_in) : sizeof(sockaddr_in6));
-
-   // register this socket in the rendezvous queue
-   // RendezevousQueue is used to temporarily store incoming handshake, non-rendezvous connections also require this function
-   uint64_t ttl = 3000000;
-   if (m_bRendezvous)
-      ttl *= 10;
-   ttl += CTimer::getTime();
-   m_pRcvQueue->registerConnector(m_SocketID, this, m_iIPversion, serv_addr, ttl);
-
-   // This is my current configurations
-   m_ConnReq.m_iVersion = m_iVersion;
-   m_ConnReq.m_iType = m_iSockType;
-   m_ConnReq.m_iMSS = m_iMSS;
-   m_ConnReq.m_iFlightFlagSize = (m_iRcvBufSize < m_iFlightFlagSize)? m_iRcvBufSize : m_iFlightFlagSize;
-   m_ConnReq.m_iReqType = (!m_bRendezvous) ? 1 : 0;
-   m_ConnReq.m_iID = m_SocketID;
-   CIPAddress::ntop(serv_addr, m_ConnReq.m_piPeerIP, m_iIPversion);
-
-   // Random Initial Sequence Number
-   srand((unsigned int)CTimer::getTime());
-   m_iISN = m_ConnReq.m_iISN = (int32_t)(CSeqNo::m_iMaxSeqNo * (double(rand()) / RAND_MAX));
-
-   m_iLastDecSeq = m_iISN - 1;
-   m_iSndLastAck = m_iISN;
-   m_iSndLastDataAck = m_iISN;
-   m_iSndCurrSeqNo = m_iISN - 1;
-   m_iSndLastAck2 = m_iISN;
-   m_ullSndLastAck2Time = CTimer::getTime();
-
-   // Inform the server my configurations.
-   CPacket request;
-   char* reqdata = new char [m_iPayloadSize];
-   request.pack(0, NULL, reqdata, m_iPayloadSize);
-   // ID = 0, connection request
-   request.m_iID = 0;
-
-   int hs_size = m_iPayloadSize;
-   m_ConnReq.serialize(reqdata, hs_size);
-   request.setLength(hs_size);
-   m_pSndQueue->sendto(serv_addr, request);
-   m_llLastReqTime = CTimer::getTime();
-
-   m_bConnecting = true;
-
-   // asynchronous connect, return immediately
-   if (!m_bSynRecving)
-   {
-      delete [] reqdata;
-      return;
-   }
-
-   // Wait for the negotiated configurations from the peer side.
-   CPacket response;
-   char* resdata = new char [m_iPayloadSize];
-   response.pack(0, NULL, resdata, m_iPayloadSize);
-
-   CUDTException e(0, 0);
-
-   while (!m_bClosing)
-   {
-      // avoid sending too many requests, at most 1 request per 250ms
-      if (CTimer::getTime() - m_llLastReqTime > 250000)
-      {
-         m_ConnReq.serialize(reqdata, hs_size);
-         request.setLength(hs_size);
-         if (m_bRendezvous)
-            request.m_iID = m_ConnRes.m_iID;
-         m_pSndQueue->sendto(serv_addr, request);
-         m_llLastReqTime = CTimer::getTime();
-      }
-
-      response.setLength(m_iPayloadSize);
-      if (m_pRcvQueue->recvfrom(m_SocketID, response) > 0)
-      {
-         if (connect(response) <= 0)
-            break;
-
-         // new request/response should be sent out immediately on receving a response
-         m_llLastReqTime = 0;
-      }
-
-      if (CTimer::getTime() > ttl)
-      {
-         // timeout
-         e = CUDTException(1, 1, 0);
-         break;
-      }
-   }
-
-   delete [] reqdata;
-   delete [] resdata;
-
-   if (e.getErrorCode() == 0)
-   {
-      if (m_bClosing)                                                 // if the socket is closed before connection...
-         e = CUDTException(1);
-      else if (1002 == m_ConnRes.m_iReqType)                          // connection request rejected
-         e = CUDTException(1, 2, 0);
-      else if ((!m_bRendezvous) && (m_iISN != m_ConnRes.m_iISN))      // secuity check
-         e = CUDTException(1, 4, 0);
-   }
-
-   if (e.getErrorCode() != 0)
-      throw e;
-}
-
-int CUDT::connect(const CPacket& response) throw ()
-{
-   // this is the 2nd half of a connection request. If the connection is setup successfully this returns 0.
-   // returning -1 means there is an error.
-   // returning 1 or 2 means the connection is in process and needs more handshake
-
-   if (!m_bConnecting)
-      return -1;
-
-   if (m_bRendezvous && ((0 == response.getFlag()) || (1 == response.getType())) && (0 != m_ConnRes.m_iType))
-   {
-      //a data packet or a keep-alive packet comes, which means the peer side is already connected
-      // in this situation, the previously recorded response will be used
-      goto POST_CONNECT;
-   }
-
-   if ((1 != response.getFlag()) || (0 != response.getType()))
-      return -1;
-
-   m_ConnRes.deserialize(response.m_pcData, response.getLength());
-
-   if (m_bRendezvous)
-   {
-      // regular connect should NOT communicate with rendezvous connect
-      // rendezvous connect require 3-way handshake
-      if (1 == m_ConnRes.m_iReqType)
-         return -1;
-
-      if ((0 == m_ConnReq.m_iReqType) || (0 == m_ConnRes.m_iReqType))
-      {
-         m_ConnReq.m_iReqType = -1;
-         // the request time must be updated so that the next handshake can be sent out immediately.
-         m_llLastReqTime = 0;
-         return 1;
-      }
-   }
-   else
-   {
-      // set cookie
-      if (1 == m_ConnRes.m_iReqType)
-      {
-         m_ConnReq.m_iReqType = -1;
-         m_ConnReq.m_iCookie = m_ConnRes.m_iCookie;
-         m_llLastReqTime = 0;
-         return 1;
-      }
-   }
-
-POST_CONNECT:
-   // Remove from rendezvous queue
-   m_pRcvQueue->removeConnector(m_SocketID);
-
-   // Re-configure according to the negotiated values.
-   m_iMSS = m_ConnRes.m_iMSS;
-   m_iFlowWindowSize = m_ConnRes.m_iFlightFlagSize;
-   m_iPktSize = m_iMSS - 28;
-   m_iPayloadSize = m_iPktSize - CPacket::m_iPktHdrSize;
-   m_iPeerISN = m_ConnRes.m_iISN;
-   m_iRcvLastAck = m_ConnRes.m_iISN;
-   m_iRcvLastAckAck = m_ConnRes.m_iISN;
-   m_iRcvCurrSeqNo = m_ConnRes.m_iISN - 1;
-   m_PeerID = m_ConnRes.m_iID;
-   memcpy(m_piSelfIP, m_ConnRes.m_piPeerIP, 16);
-
-   // Prepare all data structures
-   try
-   {
-      m_pSndBuffer = new CSndBuffer(32, m_iPayloadSize);
-      m_pRcvBuffer = new CRcvBuffer(&(m_pRcvQueue->m_UnitQueue), m_iRcvBufSize);
-      // after introducing lite ACK, the sndlosslist may not be cleared in time, so it requires twice space.
-      m_pSndLossList = new CSndLossList(m_iFlowWindowSize * 2);
-      m_pRcvLossList = new CRcvLossList(m_iFlightFlagSize);
-      m_pACKWindow = new CACKWindow(1024);
-      m_pRcvTimeWindow = new CPktTimeWindow(16, 64);
-      m_pSndTimeWindow = new CPktTimeWindow();
-   }
-   catch (...)
-   {
-      throw CUDTException(3, 2, 0);
-   }
-
-   CInfoBlock ib;
-   ib.m_iIPversion = m_iIPversion;
-   CInfoBlock::convert(m_pPeerAddr, m_iIPversion, ib.m_piIP);
-   if (m_pCache->lookup(&ib) >= 0)
-   {
-      m_iRTT = ib.m_iRTT;
-      m_iBandwidth = ib.m_iBandwidth;
-   }
-
-   m_pCC = m_pCCFactory->create();
-   m_pCC->m_UDT = m_SocketID;
-   m_pCC->setMSS(m_iMSS);
-   m_pCC->setMaxCWndSize(m_iFlowWindowSize);
-   m_pCC->setSndCurrSeqNo(m_iSndCurrSeqNo);
-   m_pCC->setRcvRate(m_iDeliveryRate);
-   m_pCC->setRTT(m_iRTT);
-   m_pCC->setBandwidth(m_iBandwidth);
-   m_pCC->init();
-
-   m_ullInterval = (uint64_t)(m_pCC->m_dPktSndPeriod * m_ullCPUFrequency);
-   m_dCongestionWindow = m_pCC->m_dCWndSize;
-
-   // And, I am connected too.
-   m_bConnecting = false;
-   m_bConnected = true;
-
-   // register this socket for receiving data packets
-   m_pRNode->m_bOnList = true;
-   m_pRcvQueue->setNewEntry(this);
-
-   // acknowledge the management module.
-   s_UDTUnited.connect_complete(m_SocketID);
-
-   // acknowledde any waiting epolls to write
-   s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_OUT, true);
-
-   return 0;
-}
-
-void CUDT::connect(const sockaddr* peer, CHandShake* hs)
-{
-   CGuard cg(m_ConnectionLock);
-
-   // Uses the smaller MSS between the peers        
-   if (hs->m_iMSS > m_iMSS)
-      hs->m_iMSS = m_iMSS;
-   else
-      m_iMSS = hs->m_iMSS;
-
-   // exchange info for maximum flow window size
-   m_iFlowWindowSize = hs->m_iFlightFlagSize;
-   hs->m_iFlightFlagSize = (m_iRcvBufSize < m_iFlightFlagSize)? m_iRcvBufSize : m_iFlightFlagSize;
-
-   m_iPeerISN = hs->m_iISN;
-
-   m_iRcvLastAck = hs->m_iISN;
-   m_iRcvLastAckAck = hs->m_iISN;
-   m_iRcvCurrSeqNo = hs->m_iISN - 1;
-
-   m_PeerID = hs->m_iID;
-   hs->m_iID = m_SocketID;
-
-   // use peer's ISN and send it back for security check
-   m_iISN = hs->m_iISN;
-
-   m_iLastDecSeq = m_iISN - 1;
-   m_iSndLastAck = m_iISN;
-   m_iSndLastDataAck = m_iISN;
-   m_iSndCurrSeqNo = m_iISN - 1;
-   m_iSndLastAck2 = m_iISN;
-   m_ullSndLastAck2Time = CTimer::getTime();
-
-   // this is a reponse handshake
-   hs->m_iReqType = -1;
-
-   // get local IP address and send the peer its IP address (because UDP cannot get local IP address)
-   memcpy(m_piSelfIP, hs->m_piPeerIP, 16);
-   CIPAddress::ntop(peer, hs->m_piPeerIP, m_iIPversion);
-  
-   m_iPktSize = m_iMSS - 28;
-   m_iPayloadSize = m_iPktSize - CPacket::m_iPktHdrSize;
-
-   // Prepare all structures
-   try
-   {
-      m_pSndBuffer = new CSndBuffer(32, m_iPayloadSize);
-      m_pRcvBuffer = new CRcvBuffer(&(m_pRcvQueue->m_UnitQueue), m_iRcvBufSize);
-      m_pSndLossList = new CSndLossList(m_iFlowWindowSize * 2);
-      m_pRcvLossList = new CRcvLossList(m_iFlightFlagSize);
-      m_pACKWindow = new CACKWindow(1024);
-      m_pRcvTimeWindow = new CPktTimeWindow(16, 64);
-      m_pSndTimeWindow = new CPktTimeWindow();
-   }
-   catch (...)
-   {
-      throw CUDTException(3, 2, 0);
-   }
-
-   CInfoBlock ib;
-   ib.m_iIPversion = m_iIPversion;
-   CInfoBlock::convert(peer, m_iIPversion, ib.m_piIP);
-   if (m_pCache->lookup(&ib) >= 0)
-   {
-      m_iRTT = ib.m_iRTT;
-      m_iBandwidth = ib.m_iBandwidth;
-   }
-
-   m_pCC = m_pCCFactory->create();
-   m_pCC->m_UDT = m_SocketID;
-   m_pCC->setMSS(m_iMSS);
-   m_pCC->setMaxCWndSize(m_iFlowWindowSize);
-   m_pCC->setSndCurrSeqNo(m_iSndCurrSeqNo);
-   m_pCC->setRcvRate(m_iDeliveryRate);
-   m_pCC->setRTT(m_iRTT);
-   m_pCC->setBandwidth(m_iBandwidth);
-   m_pCC->init();
-
-   m_ullInterval = (uint64_t)(m_pCC->m_dPktSndPeriod * m_ullCPUFrequency);
-   m_dCongestionWindow = m_pCC->m_dCWndSize;
-
-   m_pPeerAddr = (AF_INET == m_iIPversion) ? (sockaddr*)new sockaddr_in : (sockaddr*)new sockaddr_in6;
-   memcpy(m_pPeerAddr, peer, (AF_INET == m_iIPversion) ? sizeof(sockaddr_in) : sizeof(sockaddr_in6));
-
-   // And of course, it is connected.
-   m_bConnected = true;
-
-   // register this socket for receiving data packets
-   m_pRNode->m_bOnList = true;
-   m_pRcvQueue->setNewEntry(this);
-
-   //send the response to the peer, see listen() for more discussions about this
-   CPacket response;
-   int size = CHandShake::m_iContentSize;
-   char* buffer = new char[size];
-   hs->serialize(buffer, size);
-   response.pack(0, NULL, buffer, size);
-   response.m_iID = m_PeerID;
-   m_pSndQueue->sendto(peer, response);
-   delete [] buffer;
-}
-
-void CUDT::close()
-{
-   if (!m_bOpened)
-      return;
-
-   if (0 != m_Linger.l_onoff)
-   {
-      uint64_t entertime = CTimer::getTime();
-
-      while (!m_bBroken && m_bConnected && (m_pSndBuffer->getCurrBufSize() > 0) && (CTimer::getTime() - entertime < m_Linger.l_linger * 1000000ULL))
-      {
-         // linger has been checked by previous close() call and has expired
-         if (m_ullLingerExpiration >= entertime)
-            break;
-
-         if (!m_bSynSending)
-         {
-            // if this socket enables asynchronous sending, return immediately and let GC to close it later
-            if (0 == m_ullLingerExpiration)
-               m_ullLingerExpiration = entertime + m_Linger.l_linger * 1000000ULL;
-
-            return;
-         }
-
-         #ifndef WIN32
-            timespec ts;
-            ts.tv_sec = 0;
-            ts.tv_nsec = 1000000;
-            nanosleep(&ts, NULL);
-         #else
-            Sleep(1);
-         #endif
-      }
-   }
-
-   // remove this socket from the snd queue
-   if (m_bConnected)
-      m_pSndQueue->m_pSndUList->remove(this);
-
-   // trigger any pending IO events.
-   s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_ERR, true);
-   // then remove itself from all epoll monitoring
-   try
-   {
-      for (set<int>::iterator i = m_sPollID.begin(); i != m_sPollID.end(); ++ i)
-         s_UDTUnited.m_EPoll.remove_usock(*i, m_SocketID);
-   }
-   catch (...)
-   {
-   }
-
-   if (!m_bOpened)
-      return;
-
-   // Inform the threads handler to stop.
-   m_bClosing = true;
-
-   CGuard cg(m_ConnectionLock);
-
-   // Signal the sender and recver if they are waiting for data.
-   releaseSynch();
-
-   if (m_bListening)
-   {
-      m_bListening = false;
-      m_pRcvQueue->removeListener(this);
-   }
-   else if (m_bConnecting)
-   {
-      m_pRcvQueue->removeConnector(m_SocketID);
-   }
-
-   if (m_bConnected)
-   {
-      if (!m_bShutdown)
-         sendCtrl(5);
-
-      m_pCC->close();
-
-      // Store current connection information.
-      CInfoBlock ib;
-      ib.m_iIPversion = m_iIPversion;
-      CInfoBlock::convert(m_pPeerAddr, m_iIPversion, ib.m_piIP);
-      ib.m_iRTT = m_iRTT;
-      ib.m_iBandwidth = m_iBandwidth;
-      m_pCache->update(&ib);
-
-      m_bConnected = false;
-   }
-
-   // waiting all send and recv calls to stop
-   CGuard sendguard(m_SendLock);
-   CGuard recvguard(m_RecvLock);
-
-   // CLOSED.
-   m_bOpened = false;
-}
-
-int CUDT::send(const char* data, int len)
-{
-   if (UDT_DGRAM == m_iSockType)
-      throw CUDTException(5, 10, 0);
-
-   // throw an exception if not connected
-   if (m_bBroken || m_bClosing)
-      throw CUDTException(2, 1, 0);
-   else if (!m_bConnected)
-      throw CUDTException(2, 2, 0);
-
-   if (len <= 0)
-      return 0;
-
-   CGuard sendguard(m_SendLock);
-
-   if (m_pSndBuffer->getCurrBufSize() == 0)
-   {
-      // delay the EXP timer to avoid mis-fired timeout
-      uint64_t currtime;
-      CTimer::rdtsc(currtime);
-      m_ullLastRspTime = currtime;
-   }
-
-   if (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize())
-   {
-      if (!m_bSynSending)
-         throw CUDTException(6, 1, 0);
-      else
-      {
-         // wait here during a blocking sending
-         #ifndef WIN32
-            pthread_mutex_lock(&m_SendBlockLock);
-            if (m_iSndTimeOut < 0) 
-            { 
-               while (!m_bBroken && m_bConnected && !m_bClosing && (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize()) && m_bPeerHealth)
-                  pthread_cond_wait(&m_SendBlockCond, &m_SendBlockLock);
-            }
-            else
-            {
-               uint64_t exptime = CTimer::getTime() + m_iSndTimeOut * 1000ULL;
-               timespec locktime; 
-    
-               locktime.tv_sec = exptime / 1000000;
-               locktime.tv_nsec = (exptime % 1000000) * 1000;
-
-               while (!m_bBroken && m_bConnected && !m_bClosing && (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize()) && m_bPeerHealth && (CTimer::getTime() < exptime))
-                  pthread_cond_timedwait(&m_SendBlockCond, &m_SendBlockLock, &locktime);
-            }
-            pthread_mutex_unlock(&m_SendBlockLock);
-         #else
-            if (m_iSndTimeOut < 0)
-            {
-               while (!m_bBroken && m_bConnected && !m_bClosing && (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize()) && m_bPeerHealth)
-                  WaitForSingleObject(m_SendBlockCond, INFINITE);
-            }
-            else 
-            {
-               uint64_t exptime = CTimer::getTime() + m_iSndTimeOut * 1000ULL;
-
-               while (!m_bBroken && m_bConnected && !m_bClosing && (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize()) && m_bPeerHealth && (CTimer::getTime() < exptime))
-                  WaitForSingleObject(m_SendBlockCond, DWORD((exptime - CTimer::getTime()) / 1000)); 
-            }
-         #endif
-
-         // check the connection status
-         if (m_bBroken || m_bClosing)
-            throw CUDTException(2, 1, 0);
-         else if (!m_bConnected)
-            throw CUDTException(2, 2, 0);
-         else if (!m_bPeerHealth)
-         {
-            m_bPeerHealth = true;
-            throw CUDTException(7);
-         }
-      }
-   }
-
-   if (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize())
-   {
-      if (m_iSndTimeOut >= 0)
-         throw CUDTException(6, 3, 0); 
-
-      return 0;
-   }
-
-   int size = (m_iSndBufSize - m_pSndBuffer->getCurrBufSize()) * m_iPayloadSize;
-   if (size > len)
-      size = len;
-
-   // record total time used for sending
-   if (0 == m_pSndBuffer->getCurrBufSize())
-      m_llSndDurationCounter = CTimer::getTime();
-
-   // insert the user buffer into the sening list
-   m_pSndBuffer->addBuffer(data, size);
-
-   // insert this socket to snd list if it is not on the list yet
-   m_pSndQueue->m_pSndUList->update(this, false);
-
-   if (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize())
-   {
-      // write is not available any more
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_OUT, false);
-   }
-
-   return size;
-}
-
-int CUDT::recv(char* data, int len)
-{
-   if (UDT_DGRAM == m_iSockType)
-      throw CUDTException(5, 10, 0);
-
-   // throw an exception if not connected
-   if (!m_bConnected)
-      throw CUDTException(2, 2, 0);
-   else if ((m_bBroken || m_bClosing) && (0 == m_pRcvBuffer->getRcvDataSize()))
-      throw CUDTException(2, 1, 0);
-
-   if (len <= 0)
-      return 0;
-
-   CGuard recvguard(m_RecvLock);
-
-   if (0 == m_pRcvBuffer->getRcvDataSize())
-   {
-      if (!m_bSynRecving)
-         throw CUDTException(6, 2, 0);
-      else
-      {
-         #ifndef WIN32
-            pthread_mutex_lock(&m_RecvDataLock);
-            if (m_iRcvTimeOut < 0) 
-            { 
-               while (!m_bBroken && m_bConnected && !m_bClosing && (0 == m_pRcvBuffer->getRcvDataSize()))
-                  pthread_cond_wait(&m_RecvDataCond, &m_RecvDataLock);
-            }
-            else
-            {
-               uint64_t exptime = CTimer::getTime() + m_iRcvTimeOut * 1000ULL; 
-               timespec locktime; 
-    
-               locktime.tv_sec = exptime / 1000000;
-               locktime.tv_nsec = (exptime % 1000000) * 1000;
-
-               while (!m_bBroken && m_bConnected && !m_bClosing && (0 == m_pRcvBuffer->getRcvDataSize()))
-               {
-                  pthread_cond_timedwait(&m_RecvDataCond, &m_RecvDataLock, &locktime); 
-                  if (CTimer::getTime() >= exptime)
-                     break;
-               }
-            }
-            pthread_mutex_unlock(&m_RecvDataLock);
-         #else
-            if (m_iRcvTimeOut < 0)
-            {
-               while (!m_bBroken && m_bConnected && !m_bClosing && (0 == m_pRcvBuffer->getRcvDataSize()))
-                  WaitForSingleObject(m_RecvDataCond, INFINITE);
-            }
-            else
-            {
-               uint64_t enter_time = CTimer::getTime();
-
-               while (!m_bBroken && m_bConnected && !m_bClosing && (0 == m_pRcvBuffer->getRcvDataSize()))
-               {
-                  int diff = int(CTimer::getTime() - enter_time) / 1000;
-                  if (diff >= m_iRcvTimeOut)
-                      break;
-                  WaitForSingleObject(m_RecvDataCond, DWORD(m_iRcvTimeOut - diff ));
-               }
-            }
-         #endif
-      }
-   }
-
-   // throw an exception if not connected
-   if (!m_bConnected)
-      throw CUDTException(2, 2, 0);
-   else if ((m_bBroken || m_bClosing) && (0 == m_pRcvBuffer->getRcvDataSize()))
-      throw CUDTException(2, 1, 0);
-
-   int res = m_pRcvBuffer->readBuffer(data, len);
-
-   if (m_pRcvBuffer->getRcvDataSize() <= 0)
-   {
-      // read is not available any more
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_IN, false);
-   }
-
-   if ((res <= 0) && (m_iRcvTimeOut >= 0))
-      throw CUDTException(6, 3, 0);
-
-   return res;
-}
-
-int CUDT::sendmsg(const char* data, int len, int msttl, bool inorder)
-{
-   if (UDT_STREAM == m_iSockType)
-      throw CUDTException(5, 9, 0);
-
-   // throw an exception if not connected
-   if (m_bBroken || m_bClosing)
-      throw CUDTException(2, 1, 0);
-   else if (!m_bConnected)
-      throw CUDTException(2, 2, 0);
-
-   if (len <= 0)
-      return 0;
-
-   if (len > m_iSndBufSize * m_iPayloadSize)
-      throw CUDTException(5, 12, 0);
-
-   CGuard sendguard(m_SendLock);
-
-   if (m_pSndBuffer->getCurrBufSize() == 0)
-   {
-      // delay the EXP timer to avoid mis-fired timeout
-      uint64_t currtime;
-      CTimer::rdtsc(currtime);
-      m_ullLastRspTime = currtime;
-   }
-
-   if ((m_iSndBufSize - m_pSndBuffer->getCurrBufSize()) * m_iPayloadSize < len)
-   {
-      if (!m_bSynSending)
-         throw CUDTException(6, 1, 0);
-      else
-      {
-         // wait here during a blocking sending
-         #ifndef WIN32
-            pthread_mutex_lock(&m_SendBlockLock);
-            if (m_iSndTimeOut < 0)
-            {
-               while (!m_bBroken && m_bConnected && !m_bClosing && ((m_iSndBufSize - m_pSndBuffer->getCurrBufSize()) * m_iPayloadSize < len))
-                  pthread_cond_wait(&m_SendBlockCond, &m_SendBlockLock);
-            }
-            else
-            {
-               uint64_t exptime = CTimer::getTime() + m_iSndTimeOut * 1000ULL;
-               timespec locktime;
-
-               locktime.tv_sec = exptime / 1000000;
-               locktime.tv_nsec = (exptime % 1000000) * 1000;
-
-               while (!m_bBroken && m_bConnected && !m_bClosing && ((m_iSndBufSize - m_pSndBuffer->getCurrBufSize()) * m_iPayloadSize < len) && (CTimer::getTime() < exptime))
-                  pthread_cond_timedwait(&m_SendBlockCond, &m_SendBlockLock, &locktime);
-            }
-            pthread_mutex_unlock(&m_SendBlockLock);
-         #else
-            if (m_iSndTimeOut < 0)
-            {
-               while (!m_bBroken && m_bConnected && !m_bClosing && ((m_iSndBufSize - m_pSndBuffer->getCurrBufSize()) * m_iPayloadSize < len))
-                  WaitForSingleObject(m_SendBlockCond, INFINITE);
-            }
-            else
-            {
-               uint64_t exptime = CTimer::getTime() + m_iSndTimeOut * 1000ULL;
-
-               while (!m_bBroken && m_bConnected && !m_bClosing && ((m_iSndBufSize - m_pSndBuffer->getCurrBufSize()) * m_iPayloadSize < len) && (CTimer::getTime() < exptime))
-                  WaitForSingleObject(m_SendBlockCond, DWORD((exptime - CTimer::getTime()) / 1000));
-            }
-         #endif
-
-         // check the connection status
-         if (m_bBroken || m_bClosing)
-            throw CUDTException(2, 1, 0);
-         else if (!m_bConnected)
-            throw CUDTException(2, 2, 0);
-      }
-   }
-
-   if ((m_iSndBufSize - m_pSndBuffer->getCurrBufSize()) * m_iPayloadSize < len)
-   {
-      if (m_iSndTimeOut >= 0)
-         throw CUDTException(6, 3, 0);
-
-      return 0;
-   }
-
-   // record total time used for sending
-   if (0 == m_pSndBuffer->getCurrBufSize())
-      m_llSndDurationCounter = CTimer::getTime();
-
-   // insert the user buffer into the sening list
-   m_pSndBuffer->addBuffer(data, len, msttl, inorder);
-
-   // insert this socket to the snd list if it is not on the list yet
-   m_pSndQueue->m_pSndUList->update(this, false);
-
-   if (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize())
-   {
-      // write is not available any more
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_OUT, false);
-   }
-
-   return len;   
-}
-
-int CUDT::recvmsg(char* data, int len)
-{
-   if (UDT_STREAM == m_iSockType)
-      throw CUDTException(5, 9, 0);
-
-   // throw an exception if not connected
-   if (!m_bConnected)
-      throw CUDTException(2, 2, 0);
-
-   if (len <= 0)
-      return 0;
-
-   CGuard recvguard(m_RecvLock);
-
-   if (m_bBroken || m_bClosing)
-   {
-      int res = m_pRcvBuffer->readMsg(data, len);
-
-      if (m_pRcvBuffer->getRcvMsgNum() <= 0)
-      {
-         // read is not available any more
-         s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_IN, false);
-      }
-
-      if (0 == res)
-         throw CUDTException(2, 1, 0);
-      else
-         return res;
-   }
-
-   if (!m_bSynRecving)
-   {
-      int res = m_pRcvBuffer->readMsg(data, len);
-      if (0 == res)
-         throw CUDTException(6, 2, 0);
-      else
-         return res;
-   }
-
-   int res = 0;
-   bool timeout = false;
-
-   do
-   {
-      #ifndef WIN32
-         pthread_mutex_lock(&m_RecvDataLock);
-
-         if (m_iRcvTimeOut < 0)
-         {
-            while (!m_bBroken && m_bConnected && !m_bClosing && (0 == (res = m_pRcvBuffer->readMsg(data, len))))
-               pthread_cond_wait(&m_RecvDataCond, &m_RecvDataLock);
-         }
-         else
-         {
-            uint64_t exptime = CTimer::getTime() + m_iRcvTimeOut * 1000ULL;
-            timespec locktime;
-
-            locktime.tv_sec = exptime / 1000000;
-            locktime.tv_nsec = (exptime % 1000000) * 1000;
-
-            if (pthread_cond_timedwait(&m_RecvDataCond, &m_RecvDataLock, &locktime) == ETIMEDOUT)
-               timeout = true;
-
-            res = m_pRcvBuffer->readMsg(data, len);           
-         }
-         pthread_mutex_unlock(&m_RecvDataLock);
-      #else
-         if (m_iRcvTimeOut < 0)
-         {
-            while (!m_bBroken && m_bConnected && !m_bClosing && (0 == (res = m_pRcvBuffer->readMsg(data, len))))
-               WaitForSingleObject(m_RecvDataCond, INFINITE);
-         }
-         else
-         {
-            if (WaitForSingleObject(m_RecvDataCond, DWORD(m_iRcvTimeOut)) == WAIT_TIMEOUT)
-               timeout = true;
-
-            res = m_pRcvBuffer->readMsg(data, len);
-         }
-      #endif
-
-      if (m_bBroken || m_bClosing)
-         throw CUDTException(2, 1, 0);
-      else if (!m_bConnected)
-         throw CUDTException(2, 2, 0);
-   } while ((0 == res) && !timeout);
-
-   if (m_pRcvBuffer->getRcvMsgNum() <= 0)
-   {
-      // read is not available any more
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_IN, false);
-   }
-
-   if ((res <= 0) && (m_iRcvTimeOut >= 0))
-      throw CUDTException(6, 3, 0);
-
-   return res;
-}
-
-int64_t CUDT::sendfile(fstream& ifs, int64_t& offset, int64_t size, int block)
-{
-   if (UDT_DGRAM == m_iSockType)
-      throw CUDTException(5, 10, 0);
-
-   if (m_bBroken || m_bClosing)
-      throw CUDTException(2, 1, 0);
-   else if (!m_bConnected)
-      throw CUDTException(2, 2, 0);
-
-   if (size <= 0)
-      return 0;
-
-   CGuard sendguard(m_SendLock);
-
-   if (m_pSndBuffer->getCurrBufSize() == 0)
-   {
-      // delay the EXP timer to avoid mis-fired timeout
-      uint64_t currtime;
-      CTimer::rdtsc(currtime);
-      m_ullLastRspTime = currtime;
-   }
-
-   int64_t tosend = size;
-   int unitsize;
-
-   // positioning...
-   try
-   {
-      ifs.seekg((streamoff)offset);
-   }
-   catch (...)
-   {
-      throw CUDTException(4, 1);
-   }
-
-   // sending block by block
-   while (tosend > 0)
-   {
-      if (ifs.fail())
-         throw CUDTException(4, 4);
-
-      if (ifs.eof())
-         break;
-
-      unitsize = int((tosend >= block) ? block : tosend);
-
-      #ifndef WIN32
-         pthread_mutex_lock(&m_SendBlockLock);
-         while (!m_bBroken && m_bConnected && !m_bClosing && (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize()) && m_bPeerHealth)
-            pthread_cond_wait(&m_SendBlockCond, &m_SendBlockLock);
-         pthread_mutex_unlock(&m_SendBlockLock);
-      #else
-         while (!m_bBroken && m_bConnected && !m_bClosing && (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize()) && m_bPeerHealth)
-            WaitForSingleObject(m_SendBlockCond, INFINITE);
-      #endif
-
-      if (m_bBroken || m_bClosing)
-         throw CUDTException(2, 1, 0);
-      else if (!m_bConnected)
-         throw CUDTException(2, 2, 0);
-      else if (!m_bPeerHealth)
-      {
-         // reset peer health status, once this error returns, the app should handle the situation at the peer side
-         m_bPeerHealth = true;
-         throw CUDTException(7);
-      }
-
-      // record total time used for sending
-      if (0 == m_pSndBuffer->getCurrBufSize())
-         m_llSndDurationCounter = CTimer::getTime();
-
-      int64_t sentsize = m_pSndBuffer->addBufferFromFile(ifs, unitsize);
-
-      if (sentsize > 0)
-      {
-         tosend -= sentsize;
-         offset += sentsize;
-      }
-
-      // insert this socket to snd list if it is not on the list yet
-      m_pSndQueue->m_pSndUList->update(this, false);
-   }
-
-   if (m_iSndBufSize <= m_pSndBuffer->getCurrBufSize())
-   {
-      // write is not available any more
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_OUT, false);
-   }
-
-   return size - tosend;
-}
-
-int64_t CUDT::recvfile(fstream& ofs, int64_t& offset, int64_t size, int block)
-{
-   if (UDT_DGRAM == m_iSockType)
-      throw CUDTException(5, 10, 0);
-
-   if (!m_bConnected)
-      throw CUDTException(2, 2, 0);
-   else if ((m_bBroken || m_bClosing) && (0 == m_pRcvBuffer->getRcvDataSize()))
-      throw CUDTException(2, 1, 0);
-
-   if (size <= 0)
-      return 0;
-
-   CGuard recvguard(m_RecvLock);
-
-   int64_t torecv = size;
-   int unitsize = block;
-   int recvsize;
-
-   // positioning...
-   try
-   {
-      ofs.seekp((streamoff)offset);
-   }
-   catch (...)
-   {
-      throw CUDTException(4, 3);
-   }
-
-   // receiving... "recvfile" is always blocking
-   while (torecv > 0)
-   {
-      if (ofs.fail())
-      {
-         // send the sender a signal so it will not be blocked forever
-         int32_t err_code = CUDTException::EFILE;
-         sendCtrl(8, &err_code);
-
-         throw CUDTException(4, 4);
-      }
-
-      #ifndef WIN32
-         pthread_mutex_lock(&m_RecvDataLock);
-         while (!m_bBroken && m_bConnected && !m_bClosing && (0 == m_pRcvBuffer->getRcvDataSize()))
-            pthread_cond_wait(&m_RecvDataCond, &m_RecvDataLock);
-         pthread_mutex_unlock(&m_RecvDataLock);
-      #else
-         while (!m_bBroken && m_bConnected && !m_bClosing && (0 == m_pRcvBuffer->getRcvDataSize()))
-            WaitForSingleObject(m_RecvDataCond, INFINITE);
-      #endif
-
-      if (!m_bConnected)
-         throw CUDTException(2, 2, 0);
-      else if ((m_bBroken || m_bClosing) && (0 == m_pRcvBuffer->getRcvDataSize()))
-         throw CUDTException(2, 1, 0);
-
-      unitsize = int((torecv >= block) ? block : torecv);
-      recvsize = m_pRcvBuffer->readBufferToFile(ofs, unitsize);
-
-      if (recvsize > 0)
-      {
-         torecv -= recvsize;
-         offset += recvsize;
-      }
-   }
-
-   if (m_pRcvBuffer->getRcvDataSize() <= 0)
-   {
-      // read is not available any more
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_IN, false);
-   }
-
-   return size - torecv;
-}
-
-void CUDT::sample(CPerfMon* perf, bool clear)
-{
-   if (!m_bConnected)
-      throw CUDTException(2, 2, 0);
-   if (m_bBroken || m_bClosing)
-      throw CUDTException(2, 1, 0);
-
-   uint64_t currtime = CTimer::getTime();
-   perf->msTimeStamp = (currtime - m_StartTime) / 1000;
-
-   perf->pktSent = m_llTraceSent;
-   perf->pktRecv = m_llTraceRecv;
-   perf->pktSndLoss = m_iTraceSndLoss;
-   perf->pktRcvLoss = m_iTraceRcvLoss;
-   perf->pktRetrans = m_iTraceRetrans;
-   perf->pktSentACK = m_iSentACK;
-   perf->pktRecvACK = m_iRecvACK;
-   perf->pktSentNAK = m_iSentNAK;
-   perf->pktRecvNAK = m_iRecvNAK;
-   perf->usSndDuration = m_llSndDuration;
-
-   perf->pktSentTotal = m_llSentTotal;
-   perf->pktRecvTotal = m_llRecvTotal;
-   perf->pktSndLossTotal = m_iSndLossTotal;
-   perf->pktRcvLossTotal = m_iRcvLossTotal;
-   perf->pktRetransTotal = m_iRetransTotal;
-   perf->pktSentACKTotal = m_iSentACKTotal;
-   perf->pktRecvACKTotal = m_iRecvACKTotal;
-   perf->pktSentNAKTotal = m_iSentNAKTotal;
-   perf->pktRecvNAKTotal = m_iRecvNAKTotal;
-   perf->usSndDurationTotal = m_llSndDurationTotal;
-
-   double interval = double(currtime - m_LastSampleTime);
-
-   perf->mbpsSendRate = double(m_llTraceSent) * m_iPayloadSize * 8.0 / interval;
-   perf->mbpsRecvRate = double(m_llTraceRecv) * m_iPayloadSize * 8.0 / interval;
-
-   perf->usPktSndPeriod = m_ullInterval / double(m_ullCPUFrequency);
-   perf->pktFlowWindow = m_iFlowWindowSize;
-   perf->pktCongestionWindow = (int)m_dCongestionWindow;
-   perf->pktFlightSize = CSeqNo::seqlen(m_iSndLastAck, CSeqNo::incseq(m_iSndCurrSeqNo)) - 1;
-   perf->msRTT = m_iRTT/1000.0;
-   perf->mbpsBandwidth = m_iBandwidth * m_iPayloadSize * 8.0 / 1000000.0;
-
-   #ifndef WIN32
-      if (0 == pthread_mutex_trylock(&m_ConnectionLock))
-   #else
-      if (WAIT_OBJECT_0 == WaitForSingleObject(m_ConnectionLock, 0))
-   #endif
-   {
-      perf->byteAvailSndBuf = (NULL == m_pSndBuffer) ? 0 : (m_iSndBufSize - m_pSndBuffer->getCurrBufSize()) * m_iMSS;
-      perf->byteAvailRcvBuf = (NULL == m_pRcvBuffer) ? 0 : m_pRcvBuffer->getAvailBufSize() * m_iMSS;
-
-      #ifndef WIN32
-         pthread_mutex_unlock(&m_ConnectionLock);
-      #else
-         ReleaseMutex(m_ConnectionLock);
-      #endif
-   }
-   else
-   {
-      perf->byteAvailSndBuf = 0;
-      perf->byteAvailRcvBuf = 0;
-   }
-
-   if (clear)
-   {
-      m_llTraceSent = m_llTraceRecv = m_iTraceSndLoss = m_iTraceRcvLoss = m_iTraceRetrans = m_iSentACK = m_iRecvACK = m_iSentNAK = m_iRecvNAK = 0;
-      m_llSndDuration = 0;
-      m_LastSampleTime = currtime;
-   }
-}
-
-void CUDT::CCUpdate()
-{
-   m_ullInterval = (uint64_t)(m_pCC->m_dPktSndPeriod * m_ullCPUFrequency);
-   m_dCongestionWindow = m_pCC->m_dCWndSize;
-
-   if (m_llMaxBW <= 0)
-      return;
-   const double minSP = 1000000.0 / (double(m_llMaxBW) / m_iMSS) * m_ullCPUFrequency;
-   if (m_ullInterval < minSP)
-       m_ullInterval = minSP;
-}
-
-void CUDT::initSynch()
-{
-   #ifndef WIN32
-      pthread_mutex_init(&m_SendBlockLock, NULL);
-      pthread_cond_init(&m_SendBlockCond, NULL);
-      pthread_mutex_init(&m_RecvDataLock, NULL);
-      pthread_cond_init(&m_RecvDataCond, NULL);
-      pthread_mutex_init(&m_SendLock, NULL);
-      pthread_mutex_init(&m_RecvLock, NULL);
-      pthread_mutex_init(&m_AckLock, NULL);
-      pthread_mutex_init(&m_ConnectionLock, NULL);
-   #else
-      m_SendBlockLock = CreateMutex(NULL, false, NULL);
-      m_SendBlockCond = CreateEvent(NULL, false, false, NULL);
-      m_RecvDataLock = CreateMutex(NULL, false, NULL);
-      m_RecvDataCond = CreateEvent(NULL, false, false, NULL);
-      m_SendLock = CreateMutex(NULL, false, NULL);
-      m_RecvLock = CreateMutex(NULL, false, NULL);
-      m_AckLock = CreateMutex(NULL, false, NULL);
-      m_ConnectionLock = CreateMutex(NULL, false, NULL);
-   #endif
-}
-
-void CUDT::destroySynch()
-{
-   #ifndef WIN32
-      pthread_mutex_destroy(&m_SendBlockLock);
-      pthread_cond_destroy(&m_SendBlockCond);
-      pthread_mutex_destroy(&m_RecvDataLock);
-      pthread_cond_destroy(&m_RecvDataCond);
-      pthread_mutex_destroy(&m_SendLock);
-      pthread_mutex_destroy(&m_RecvLock);
-      pthread_mutex_destroy(&m_AckLock);
-      pthread_mutex_destroy(&m_ConnectionLock);
-   #else
-      CloseHandle(m_SendBlockLock);
-      CloseHandle(m_SendBlockCond);
-      CloseHandle(m_RecvDataLock);
-      CloseHandle(m_RecvDataCond);
-      CloseHandle(m_SendLock);
-      CloseHandle(m_RecvLock);
-      CloseHandle(m_AckLock);
-      CloseHandle(m_ConnectionLock);
-   #endif
-}
-
-void CUDT::releaseSynch()
-{
-   #ifndef WIN32
-      // wake up user calls
-      pthread_mutex_lock(&m_SendBlockLock);
-      pthread_cond_signal(&m_SendBlockCond);
-      pthread_mutex_unlock(&m_SendBlockLock);
-
-      pthread_mutex_lock(&m_SendLock);
-      pthread_mutex_unlock(&m_SendLock);
-
-      pthread_mutex_lock(&m_RecvDataLock);
-      pthread_cond_signal(&m_RecvDataCond);
-      pthread_mutex_unlock(&m_RecvDataLock);
-
-      pthread_mutex_lock(&m_RecvLock);
-      pthread_mutex_unlock(&m_RecvLock);
-   #else
-      SetEvent(m_SendBlockCond);
-      WaitForSingleObject(m_SendLock, INFINITE);
-      ReleaseMutex(m_SendLock);
-      SetEvent(m_RecvDataCond);
-      WaitForSingleObject(m_RecvLock, INFINITE);
-      ReleaseMutex(m_RecvLock);
-   #endif
-}
-
-void CUDT::sendCtrl(int pkttype, void* lparam, void* rparam, int size)
-{
-   CPacket ctrlpkt;
-
-   switch (pkttype)
-   {
-   case 2: //010 - Acknowledgement
-      {
-      int32_t ack;
-
-      // If there is no loss, the ACK is the current largest sequence number plus 1;
-      // Otherwise it is the smallest sequence number in the receiver loss list.
-      if (0 == m_pRcvLossList->getLossLength())
-         ack = CSeqNo::incseq(m_iRcvCurrSeqNo);
-      else
-         ack = m_pRcvLossList->getFirstLostSeq();
-
-      if (ack == m_iRcvLastAckAck)
-         break;
-
-      // send out a lite ACK
-      // to save time on buffer processing and bandwidth/AS measurement, a lite ACK only feeds back an ACK number
-      if (4 == size)
-      {
-         ctrlpkt.pack(pkttype, NULL, &ack, size);
-         ctrlpkt.m_iID = m_PeerID;
-         m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-         break;
-      }
-
-      uint64_t currtime;
-      CTimer::rdtsc(currtime);
-
-      // There are new received packets to acknowledge, update related information.
-      if (CSeqNo::seqcmp(ack, m_iRcvLastAck) > 0)
-      {
-         int acksize = CSeqNo::seqoff(m_iRcvLastAck, ack);
-
-         m_iRcvLastAck = ack;
-
-         m_pRcvBuffer->ackData(acksize);
-
-         // signal a waiting "recv" call if there is any data available
-         #ifndef WIN32
-            pthread_mutex_lock(&m_RecvDataLock);
-            if (m_bSynRecving)
-               pthread_cond_signal(&m_RecvDataCond);
-            pthread_mutex_unlock(&m_RecvDataLock);
-         #else
-            if (m_bSynRecving)
-               SetEvent(m_RecvDataCond);
-         #endif
-
-         // acknowledge any waiting epolls to read
-         s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_IN, true);
-      }
-      else if (ack == m_iRcvLastAck)
-      {
-         if ((currtime - m_ullLastAckTime) < ((m_iRTT + 4 * m_iRTTVar) * m_ullCPUFrequency))
-            break;
-      }
-      else
-         break;
-
-      // Send out the ACK only if has not been received by the sender before
-      if (CSeqNo::seqcmp(m_iRcvLastAck, m_iRcvLastAckAck) > 0)
-      {
-         int32_t data[6];
-
-         m_iAckSeqNo = CAckNo::incack(m_iAckSeqNo);
-         data[0] = m_iRcvLastAck;
-         data[1] = m_iRTT;
-         data[2] = m_iRTTVar;
-         data[3] = m_pRcvBuffer->getAvailBufSize();
-         // a minimum flow window of 2 is used, even if buffer is full, to break potential deadlock
-         if (data[3] < 2)
-            data[3] = 2;
-
-         if (currtime - m_ullLastAckTime > m_ullSYNInt)
-         {
-            data[4] = m_pRcvTimeWindow->getPktRcvSpeed();
-            data[5] = m_pRcvTimeWindow->getBandwidth();
-            ctrlpkt.pack(pkttype, &m_iAckSeqNo, data, 24);
-
-            CTimer::rdtsc(m_ullLastAckTime);
-         }
-         else
-         {
-            ctrlpkt.pack(pkttype, &m_iAckSeqNo, data, 16);
-         }
-
-         ctrlpkt.m_iID = m_PeerID;
-         m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-         m_pACKWindow->store(m_iAckSeqNo, m_iRcvLastAck);
-
-         ++ m_iSentACK;
-         ++ m_iSentACKTotal;
-      }
-
-      break;
-      }
-
-   case 6: //110 - Acknowledgement of Acknowledgement
-      ctrlpkt.pack(pkttype, lparam);
-      ctrlpkt.m_iID = m_PeerID;
-      m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-      break;
-
-   case 3: //011 - Loss Report
-      {
-      if (NULL != rparam)
-      {
-         if (1 == size)
-         {
-            // only 1 loss packet
-            ctrlpkt.pack(pkttype, NULL, (int32_t *)rparam + 1, 4);
-         }
-         else
-         {
-            // more than 1 loss packets
-            ctrlpkt.pack(pkttype, NULL, rparam, 8);
-         }
-
-         ctrlpkt.m_iID = m_PeerID;
-         m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-         ++ m_iSentNAK;
-         ++ m_iSentNAKTotal;
-      }
-      else if (m_pRcvLossList->getLossLength() > 0)
-      {
-         // this is periodically NAK report; make sure NAK cannot be sent back too often
-
-         // read loss list from the local receiver loss list
-         int32_t* data = new int32_t[m_iPayloadSize / 4];
-         int losslen;
-         m_pRcvLossList->getLossArray(data, losslen, m_iPayloadSize / 4);
-
-         if (0 < losslen)
-         {
-            ctrlpkt.pack(pkttype, NULL, data, losslen * 4);
-            ctrlpkt.m_iID = m_PeerID;
-            m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-            ++ m_iSentNAK;
-            ++ m_iSentNAKTotal;
-         }
-
-         delete [] data;
-      }
-
-      // update next NAK time, which should wait enough time for the retansmission, but not too long
-      m_ullNAKInt = (m_iRTT + 4 * m_iRTTVar) * m_ullCPUFrequency;
-      int rcv_speed = m_pRcvTimeWindow->getPktRcvSpeed();
-      if (rcv_speed > 0)
-         m_ullNAKInt += (m_pRcvLossList->getLossLength() * 1000000ULL / rcv_speed) * m_ullCPUFrequency;
-      if (m_ullNAKInt < m_ullMinNakInt)
-         m_ullNAKInt = m_ullMinNakInt;
-
-      break;
-      }
-
-   case 4: //100 - Congestion Warning
-      ctrlpkt.pack(pkttype);
-      ctrlpkt.m_iID = m_PeerID;
-      m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-      CTimer::rdtsc(m_ullLastWarningTime);
-
-      break;
-
-   case 1: //001 - Keep-alive
-      ctrlpkt.pack(pkttype);
-      ctrlpkt.m_iID = m_PeerID;
-      m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
- 
-      break;
-
-   case 0: //000 - Handshake
-      ctrlpkt.pack(pkttype, NULL, rparam, sizeof(CHandShake));
-      ctrlpkt.m_iID = m_PeerID;
-      m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-      break;
-
-   case 5: //101 - Shutdown
-      ctrlpkt.pack(pkttype);
-      ctrlpkt.m_iID = m_PeerID;
-      m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-      break;
-
-   case 7: //111 - Msg drop request
-      ctrlpkt.pack(pkttype, lparam, rparam, 8);
-      ctrlpkt.m_iID = m_PeerID;
-      m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-      break;
-
-   case 8: //1000 - acknowledge the peer side a special error
-      ctrlpkt.pack(pkttype, lparam);
-      ctrlpkt.m_iID = m_PeerID;
-      m_pSndQueue->sendto(m_pPeerAddr, ctrlpkt);
-
-      break;
-
-   case 32767: //0x7FFF - Resevered for future use
-      break;
-
-   default:
-      break;
-   }
-}
-
-void CUDT::processCtrl(CPacket& ctrlpkt)
-{
-   // Just heard from the peer, reset the expiration count.
-   m_iEXPCount = 1;
-   uint64_t currtime;
-   CTimer::rdtsc(currtime);
-   m_ullLastRspTime = currtime;
-
-   switch (ctrlpkt.getType())
-   {
-   case 2: //010 - Acknowledgement
-      {
-      int32_t ack;
-
-      // process a lite ACK
-      if (4 == ctrlpkt.getLength())
-      {
-         ack = *(int32_t *)ctrlpkt.m_pcData;
-         if (CSeqNo::seqcmp(ack, m_iSndLastAck) >= 0)
-         {
-            m_iFlowWindowSize -= CSeqNo::seqoff(m_iSndLastAck, ack);
-            m_iSndLastAck = ack;
-         }
-
-         break;
-      }
-
-       // read ACK seq. no.
-      ack = ctrlpkt.getAckSeqNo();
-
-      // send ACK acknowledgement
-      // number of ACK2 can be much less than number of ACK
-      uint64_t now = CTimer::getTime();
-      if ((currtime - m_ullSndLastAck2Time > (uint64_t)m_iSYNInterval) || (ack == m_iSndLastAck2))
-      {
-         sendCtrl(6, &ack);
-         m_iSndLastAck2 = ack;
-         m_ullSndLastAck2Time = now;
-      }
-
-      // Got data ACK
-      ack = *(int32_t *)ctrlpkt.m_pcData;
-
-      // check the validation of the ack
-      if (CSeqNo::seqcmp(ack, CSeqNo::incseq(m_iSndCurrSeqNo)) > 0)
-      {
-         //this should not happen: attack or bug
-         m_bBroken = true;
-         m_iBrokenCounter = 0;
-         break;
-      }
-
-      if (CSeqNo::seqcmp(ack, m_iSndLastAck) >= 0)
-      {
-         // Update Flow Window Size, must update before and together with m_iSndLastAck
-         m_iFlowWindowSize = *((int32_t *)ctrlpkt.m_pcData + 3);
-         m_iSndLastAck = ack;
-      }
-
-      // protect packet retransmission
-      CGuard::enterCS(m_AckLock);
-
-      int offset = CSeqNo::seqoff(m_iSndLastDataAck, ack);
-      if (offset <= 0)
-      {
-         // discard it if it is a repeated ACK
-         CGuard::leaveCS(m_AckLock);
-         break;
-      }
-
-      // acknowledge the sending buffer
-      m_pSndBuffer->ackData(offset);
-
-      // record total time used for sending
-      m_llSndDuration += currtime - m_llSndDurationCounter;
-      m_llSndDurationTotal += currtime - m_llSndDurationCounter;
-      m_llSndDurationCounter = currtime;
-
-      // update sending variables
-      m_iSndLastDataAck = ack;
-      m_pSndLossList->remove(CSeqNo::decseq(m_iSndLastDataAck));
-
-      CGuard::leaveCS(m_AckLock);
-
-      #ifndef WIN32
-         pthread_mutex_lock(&m_SendBlockLock);
-         if (m_bSynSending)
-            pthread_cond_signal(&m_SendBlockCond);
-         pthread_mutex_unlock(&m_SendBlockLock);
-      #else
-         if (m_bSynSending)
-            SetEvent(m_SendBlockCond);
-      #endif
-
-      // acknowledde any waiting epolls to write
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_OUT, true);
-
-      // insert this socket to snd list if it is not on the list yet
-      m_pSndQueue->m_pSndUList->update(this, false);
-
-      // Update RTT
-      //m_iRTT = *((int32_t *)ctrlpkt.m_pcData + 1);
-      //m_iRTTVar = *((int32_t *)ctrlpkt.m_pcData + 2);
-      int rtt = *((int32_t *)ctrlpkt.m_pcData + 1);
-      m_iRTTVar = (m_iRTTVar * 3 + abs(rtt - m_iRTT)) >> 2;
-      m_iRTT = (m_iRTT * 7 + rtt) >> 3;
-
-      m_pCC->setRTT(m_iRTT);
-
-      if (ctrlpkt.getLength() > 16)
-      {
-         // Update Estimated Bandwidth and packet delivery rate
-         if (*((int32_t *)ctrlpkt.m_pcData + 4) > 0)
-            m_iDeliveryRate = (m_iDeliveryRate * 7 + *((int32_t *)ctrlpkt.m_pcData + 4)) >> 3;
-
-         if (*((int32_t *)ctrlpkt.m_pcData + 5) > 0)
-            m_iBandwidth = (m_iBandwidth * 7 + *((int32_t *)ctrlpkt.m_pcData + 5)) >> 3;
-
-         m_pCC->setRcvRate(m_iDeliveryRate);
-         m_pCC->setBandwidth(m_iBandwidth);
-      }
-
-      m_pCC->onACK(ack);
-      CCUpdate();
-
-      ++ m_iRecvACK;
-      ++ m_iRecvACKTotal;
-
-      break;
-      }
-
-   case 6: //110 - Acknowledgement of Acknowledgement
-      {
-      int32_t ack;
-      int rtt = -1;
-
-      // update RTT
-      rtt = m_pACKWindow->acknowledge(ctrlpkt.getAckSeqNo(), ack);
-      if (rtt <= 0)
-         break;
-
-      //if increasing delay detected...
-      //   sendCtrl(4);
-
-      // RTT EWMA
-      m_iRTTVar = (m_iRTTVar * 3 + abs(rtt - m_iRTT)) >> 2;
-      m_iRTT = (m_iRTT * 7 + rtt) >> 3;
-
-      m_pCC->setRTT(m_iRTT);
-
-      // update last ACK that has been received by the sender
-      if (CSeqNo::seqcmp(ack, m_iRcvLastAckAck) > 0)
-         m_iRcvLastAckAck = ack;
-
-      break;
-      }
-
-   case 3: //011 - Loss Report
-      {
-      int32_t* losslist = (int32_t *)(ctrlpkt.m_pcData);
-
-      m_pCC->onLoss(losslist, ctrlpkt.getLength() / 4);
-      CCUpdate();
-
-      bool secure = true;
-
-      // decode loss list message and insert loss into the sender loss list
-      for (int i = 0, n = (int)(ctrlpkt.getLength() / 4); i < n; ++ i)
-      {
-         if (0 != (losslist[i] & 0x80000000))
-         {
-            if ((CSeqNo::seqcmp(losslist[i] & 0x7FFFFFFF, losslist[i + 1]) > 0) || (CSeqNo::seqcmp(losslist[i + 1], m_iSndCurrSeqNo) > 0))
-            {
-               // seq_a must not be greater than seq_b; seq_b must not be greater than the most recent sent seq
-               secure = false;
-               break;
-            }
-
-            int num = 0;
-            if (CSeqNo::seqcmp(losslist[i] & 0x7FFFFFFF, m_iSndLastAck) >= 0)
-               num = m_pSndLossList->insert(losslist[i] & 0x7FFFFFFF, losslist[i + 1]);
-            else if (CSeqNo::seqcmp(losslist[i + 1], m_iSndLastAck) >= 0)
-               num = m_pSndLossList->insert(m_iSndLastAck, losslist[i + 1]);
-
-            m_iTraceSndLoss += num;
-            m_iSndLossTotal += num;
-
-            ++ i;
-         }
-         else if (CSeqNo::seqcmp(losslist[i], m_iSndLastAck) >= 0)
-         {
-            if (CSeqNo::seqcmp(losslist[i], m_iSndCurrSeqNo) > 0)
-            {
-               //seq_a must not be greater than the most recent sent seq
-               secure = false;
-               break;
-            }
-
-            int num = m_pSndLossList->insert(losslist[i], losslist[i]);
-
-            m_iTraceSndLoss += num;
-            m_iSndLossTotal += num;
-         }
-      }
-
-      if (!secure)
-      {
-         //this should not happen: attack or bug
-         m_bBroken = true;
-         m_iBrokenCounter = 0;
-         break;
-      }
-
-      // the lost packet (retransmission) should be sent out immediately
-      m_pSndQueue->m_pSndUList->update(this);
-
-      ++ m_iRecvNAK;
-      ++ m_iRecvNAKTotal;
-
-      break;
-      }
-
-   case 4: //100 - Delay Warning
-      // One way packet delay is increasing, so decrease the sending rate
-      m_ullInterval = (uint64_t)ceil(m_ullInterval * 1.125);
-      m_iLastDecSeq = m_iSndCurrSeqNo;
-
-      break;
-
-   case 1: //001 - Keep-alive
-      // The only purpose of keep-alive packet is to tell that the peer is still alive
-      // nothing needs to be done.
-
-      break;
-
-   case 0: //000 - Handshake
-      {
-      CHandShake req;
-      req.deserialize(ctrlpkt.m_pcData, ctrlpkt.getLength());
-      if ((req.m_iReqType > 0) || (m_bRendezvous && (req.m_iReqType != -2)))
-      {
-         // The peer side has not received the handshake message, so it keeps querying
-         // resend the handshake packet
-
-         CHandShake initdata;
-         initdata.m_iISN = m_iISN;
-         initdata.m_iMSS = m_iMSS;
-         initdata.m_iFlightFlagSize = m_iFlightFlagSize;
-         initdata.m_iReqType = (!m_bRendezvous) ? -1 : -2;
-         initdata.m_iID = m_SocketID;
-
-         char* hs = new char [m_iPayloadSize];
-         int hs_size = m_iPayloadSize;
-         initdata.serialize(hs, hs_size);
-         sendCtrl(0, NULL, hs, hs_size);
-         delete [] hs;
-      }
-
-      break;
-      }
-
-   case 5: //101 - Shutdown
-      m_bShutdown = true;
-      m_bClosing = true;
-      m_bBroken = true;
-      m_iBrokenCounter = 60;
-
-      // Signal the sender and recver if they are waiting for data.
-      releaseSynch();
-
-      CTimer::triggerEvent();
-
-      break;
-
-   case 7: //111 - Msg drop request
-      m_pRcvBuffer->dropMsg(ctrlpkt.getMsgSeq());
-      m_pRcvLossList->remove(*(int32_t*)ctrlpkt.m_pcData, *(int32_t*)(ctrlpkt.m_pcData + 4));
-
-      // move forward with current recv seq no.
-      if ((CSeqNo::seqcmp(*(int32_t*)ctrlpkt.m_pcData, CSeqNo::incseq(m_iRcvCurrSeqNo)) <= 0)
-         && (CSeqNo::seqcmp(*(int32_t*)(ctrlpkt.m_pcData + 4), m_iRcvCurrSeqNo) > 0))
-      {
-         m_iRcvCurrSeqNo = *(int32_t*)(ctrlpkt.m_pcData + 4);
-      }
-
-      break;
-
-   case 8: // 1000 - An error has happened to the peer side
-      //int err_type = packet.getAddInfo();
-
-      // currently only this error is signalled from the peer side
-      // if recvfile() failes (e.g., due to disk fail), blcoked sendfile/send should return immediately
-      // giving the app a chance to fix the issue
-
-      m_bPeerHealth = false;
-
-      break;
-
-   case 32767: //0x7FFF - reserved and user defined messages
-      m_pCC->processCustomMsg(&ctrlpkt);
-      CCUpdate();
-
-      break;
-
-   default:
-      break;
-   }
-}
-
-int CUDT::packData(CPacket& packet, uint64_t& ts)
-{
-   int payload = 0;
-   bool probe = false;
-
-   uint64_t entertime;
-   CTimer::rdtsc(entertime);
-
-   if ((0 != m_ullTargetTime) && (entertime > m_ullTargetTime))
-      m_ullTimeDiff += entertime - m_ullTargetTime;
-
-   // Loss retransmission always has higher priority.
-   if ((packet.m_iSeqNo = m_pSndLossList->getLostSeq()) >= 0)
-   {
-      // protect m_iSndLastDataAck from updating by ACK processing
-      CGuard ackguard(m_AckLock);
-
-      int offset = CSeqNo::seqoff(m_iSndLastDataAck, packet.m_iSeqNo);
-      if (offset < 0)
-         return 0;
-
-      int msglen;
-
-      payload = m_pSndBuffer->readData(&(packet.m_pcData), offset, packet.m_iMsgNo, msglen);
-
-      if (-1 == payload)
-      {
-         int32_t seqpair[2];
-         seqpair[0] = packet.m_iSeqNo;
-         seqpair[1] = CSeqNo::incseq(seqpair[0], msglen);
-         sendCtrl(7, &packet.m_iMsgNo, seqpair, 8);
-
-         // only one msg drop request is necessary
-         m_pSndLossList->remove(seqpair[1]);
-
-         // skip all dropped packets
-         if (CSeqNo::seqcmp(m_iSndCurrSeqNo, CSeqNo::incseq(seqpair[1])) < 0)
-             m_iSndCurrSeqNo = CSeqNo::incseq(seqpair[1]);
-
-         return 0;
-      }
-      else if (0 == payload)
-         return 0;
-
-      ++ m_iTraceRetrans;
-      ++ m_iRetransTotal;
-   }
-   else
-   {
-      // If no loss, pack a new packet.
-
-      // check congestion/flow window limit
-      int cwnd = (m_iFlowWindowSize < (int)m_dCongestionWindow) ? m_iFlowWindowSize : (int)m_dCongestionWindow;
-      if (cwnd >= CSeqNo::seqlen(m_iSndLastAck, CSeqNo::incseq(m_iSndCurrSeqNo)))
-      {
-         if (0 != (payload = m_pSndBuffer->readData(&(packet.m_pcData), packet.m_iMsgNo)))
-         {
-            m_iSndCurrSeqNo = CSeqNo::incseq(m_iSndCurrSeqNo);
-            m_pCC->setSndCurrSeqNo(m_iSndCurrSeqNo);
-
-            packet.m_iSeqNo = m_iSndCurrSeqNo;
-
-            // every 16 (0xF) packets, a packet pair is sent
-            if (0 == (packet.m_iSeqNo & 0xF))
-               probe = true;
-         }
-         else
-         {
-            m_ullTargetTime = 0;
-            m_ullTimeDiff = 0;
-            ts = 0;
-            return 0;
-         }
-      }
-      else
-      {
-         m_ullTargetTime = 0;
-         m_ullTimeDiff = 0;
-         ts = 0;
-         return 0;
-      }
-   }
-
-   packet.m_iTimeStamp = int(CTimer::getTime() - m_StartTime);
-   packet.m_iID = m_PeerID;
-   packet.setLength(payload);
-
-   m_pCC->onPktSent(&packet);
-   //m_pSndTimeWindow->onPktSent(packet.m_iTimeStamp);
-
-   ++ m_llTraceSent;
-   ++ m_llSentTotal;
-
-   if (probe)
-   {
-      // sends out probing packet pair
-      ts = entertime;
-      probe = false;
-   }
-   else
-   {
-      #ifndef NO_BUSY_WAITING
-         ts = entertime + m_ullInterval;
-      #else
-         if (m_ullTimeDiff >= m_ullInterval)
-         {
-            ts = entertime;
-            m_ullTimeDiff -= m_ullInterval;
-         }
-         else
-         {
-            ts = entertime + m_ullInterval - m_ullTimeDiff;
-            m_ullTimeDiff = 0;
-         }
-      #endif
-   }
-
-   m_ullTargetTime = ts;
-
-   return payload;
-}
-
-int CUDT::processData(CUnit* unit)
-{
-   CPacket& packet = unit->m_Packet;
-
-   // Just heard from the peer, reset the expiration count.
-   m_iEXPCount = 1;
-   uint64_t currtime;
-   CTimer::rdtsc(currtime);
-   m_ullLastRspTime = currtime;
-
-   m_pCC->onPktReceived(&packet);
-   ++ m_iPktCount;
-   // update time information
-   m_pRcvTimeWindow->onPktArrival();
-
-   // check if it is probing packet pair
-   if (0 == (packet.m_iSeqNo & 0xF))
-      m_pRcvTimeWindow->probe1Arrival();
-   else if (1 == (packet.m_iSeqNo & 0xF))
-      m_pRcvTimeWindow->probe2Arrival();
-
-   ++ m_llTraceRecv;
-   ++ m_llRecvTotal;
-
-   int32_t offset = CSeqNo::seqoff(m_iRcvLastAck, packet.m_iSeqNo);
-   if ((offset < 0) || (offset >= m_pRcvBuffer->getAvailBufSize()))
-      return -1;
-
-   if (m_pRcvBuffer->addData(unit, offset) < 0)
-      return -1;
-
-   // Loss detection.
-   if (CSeqNo::seqcmp(packet.m_iSeqNo, CSeqNo::incseq(m_iRcvCurrSeqNo)) > 0)
-   {
-      // If loss found, insert them to the receiver loss list
-      m_pRcvLossList->insert(CSeqNo::incseq(m_iRcvCurrSeqNo), CSeqNo::decseq(packet.m_iSeqNo));
-
-      // pack loss list for NAK
-      int32_t lossdata[2];
-      lossdata[0] = CSeqNo::incseq(m_iRcvCurrSeqNo) | 0x80000000;
-      lossdata[1] = CSeqNo::decseq(packet.m_iSeqNo);
-
-      // Generate loss report immediately.
-      sendCtrl(3, NULL, lossdata, (CSeqNo::incseq(m_iRcvCurrSeqNo) == CSeqNo::decseq(packet.m_iSeqNo)) ? 1 : 2);
-
-      int loss = CSeqNo::seqlen(m_iRcvCurrSeqNo, packet.m_iSeqNo) - 2;
-      m_iTraceRcvLoss += loss;
-      m_iRcvLossTotal += loss;
-   }
-
-   // This is not a regular fixed size packet...   
-   //an irregular sized packet usually indicates the end of a message, so send an ACK immediately   
-   if (packet.getLength() != m_iPayloadSize)   
-      CTimer::rdtsc(m_ullNextACKTime); 
-
-   // Update the current largest sequence number that has been received.
-   // Or it is a retransmitted packet, remove it from receiver loss list.
-   if (CSeqNo::seqcmp(packet.m_iSeqNo, m_iRcvCurrSeqNo) > 0)
-      m_iRcvCurrSeqNo = packet.m_iSeqNo;
-   else
-      m_pRcvLossList->remove(packet.m_iSeqNo);
-
-   return 0;
-}
-
-int CUDT::listen(sockaddr* addr, CPacket& packet)
-{
-   if (m_bClosing)
-      return 1002;
-
-   if (packet.getLength() != CHandShake::m_iContentSize)
-      return 1004;
-
-   CHandShake hs;
-   hs.deserialize(packet.m_pcData, packet.getLength());
-
-   // SYN cookie
-   char clienthost[NI_MAXHOST];
-   char clientport[NI_MAXSERV];
-   getnameinfo(addr, (AF_INET == m_iVersion) ? sizeof(sockaddr_in) : sizeof(sockaddr_in6), clienthost, sizeof(clienthost), clientport, sizeof(clientport), NI_NUMERICHOST|NI_NUMERICSERV);
-   int64_t timestamp = (CTimer::getTime() - m_StartTime) / 60000000; // secret changes every one minute
-   stringstream cookiestr;
-   cookiestr << clienthost << ":" << clientport << ":" << timestamp;
-   unsigned char cookie[16];
-   CMD5::compute(cookiestr.str().c_str(), cookie);
-
-   if (1 == hs.m_iReqType)
-   {
-      hs.m_iCookie = *(int*)cookie;
-      packet.m_iID = hs.m_iID;
-      int size = packet.getLength();
-      hs.serialize(packet.m_pcData, size);
-      m_pSndQueue->sendto(addr, packet);
-      return 0;
-   }
-   else
-   {
-      if (hs.m_iCookie != *(int*)cookie)
-      {
-         timestamp --;
-         cookiestr << clienthost << ":" << clientport << ":" << timestamp;
-         CMD5::compute(cookiestr.str().c_str(), cookie);
-
-         if (hs.m_iCookie != *(int*)cookie)
-            return -1;
-      }
-   }
-
-   int32_t id = hs.m_iID;
-
-   // When a peer side connects in...
-   if ((1 == packet.getFlag()) && (0 == packet.getType()))
-   {
-      if ((hs.m_iVersion != m_iVersion) || (hs.m_iType != m_iSockType))
-      {
-         // mismatch, reject the request
-         hs.m_iReqType = 1002;
-         int size = CHandShake::m_iContentSize;
-         hs.serialize(packet.m_pcData, size);
-         packet.m_iID = id;
-         m_pSndQueue->sendto(addr, packet);
-      }
-      else
-      {
-         int result = s_UDTUnited.newConnection(m_SocketID, addr, &hs);
-         if (result == -1)
-            hs.m_iReqType = 1002;
-
-         // send back a response if connection failed or connection already existed
-         // new connection response should be sent in connect()
-         if (result != 1)
-         {
-            int size = CHandShake::m_iContentSize;
-            hs.serialize(packet.m_pcData, size);
-            packet.m_iID = id;
-            m_pSndQueue->sendto(addr, packet);
-         }
-         else
-         {
-            // a new connection has been created, enable epoll for write 
-            s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_OUT, true);
-         }
-      }
-   }
-
-   return hs.m_iReqType;
-}
-
-void CUDT::checkTimers()
-{
-   // update CC parameters
-   CCUpdate();
-   //uint64_t minint = (uint64_t)(m_ullCPUFrequency * m_pSndTimeWindow->getMinPktSndInt() * 0.9);
-   //if (m_ullInterval < minint)
-   //   m_ullInterval = minint;
-
-   uint64_t currtime;
-   CTimer::rdtsc(currtime);
-
-   if ((currtime > m_ullNextACKTime) || ((m_pCC->m_iACKInterval > 0) && (m_pCC->m_iACKInterval <= m_iPktCount)))
-   {
-      // ACK timer expired or ACK interval is reached
-
-      sendCtrl(2);
-      CTimer::rdtsc(currtime);
-      if (m_pCC->m_iACKPeriod > 0)
-         m_ullNextACKTime = currtime + m_pCC->m_iACKPeriod * m_ullCPUFrequency;
-      else
-         m_ullNextACKTime = currtime + m_ullACKInt;
-
-      m_iPktCount = 0;
-      m_iLightACKCount = 1;
-   }
-   else if (m_iSelfClockInterval * m_iLightACKCount <= m_iPktCount)
-   {
-      //send a "light" ACK
-      sendCtrl(2, NULL, NULL, 4);
-      ++ m_iLightACKCount;
-   }
-
-   // we are not sending back repeated NAK anymore and rely on the sender's EXP for retransmission
-   //if ((m_pRcvLossList->getLossLength() > 0) && (currtime > m_ullNextNAKTime))
-   //{
-   //   // NAK timer expired, and there is loss to be reported.
-   //   sendCtrl(3);
-   //
-   //   CTimer::rdtsc(currtime);
-   //   m_ullNextNAKTime = currtime + m_ullNAKInt;
-   //}
-
-   uint64_t next_exp_time;
-   if (m_pCC->m_bUserDefinedRTO)
-      next_exp_time = m_ullLastRspTime + m_pCC->m_iRTO * m_ullCPUFrequency;
-   else
-   {
-      uint64_t exp_int = (m_iEXPCount * (m_iRTT + 4 * m_iRTTVar) + m_iSYNInterval) * m_ullCPUFrequency;
-      if (exp_int < m_iEXPCount * m_ullMinExpInt)
-         exp_int = m_iEXPCount * m_ullMinExpInt;
-      next_exp_time = m_ullLastRspTime + exp_int;
-   }
-
-   if (currtime > next_exp_time)
-   {
-      // Haven't receive any information from the peer, is it dead?!
-      // timeout: at least 16 expirations and must be greater than 10 seconds
-      if ((m_iEXPCount > 16) && (currtime - m_ullLastRspTime > 5000000 * m_ullCPUFrequency))
-      {
-         //
-         // Connection is broken. 
-         // UDT does not signal any information about this instead of to stop quietly.
-         // Application will detect this when it calls any UDT methods next time.
-         //
-         m_bClosing = true;
-         m_bBroken = true;
-         m_iBrokenCounter = 30;
-
-         // update snd U list to remove this socket
-         m_pSndQueue->m_pSndUList->update(this);
-
-         releaseSynch();
-
-         // app can call any UDT API to learn the connection_broken error
-         s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_IN | UDT_EPOLL_OUT | UDT_EPOLL_ERR, true);
-
-         CTimer::triggerEvent();
-
-         return;
-      }
-
-      // sender: Insert all the packets sent after last received acknowledgement into the sender loss list.
-      // recver: Send out a keep-alive packet
-      if (m_pSndBuffer->getCurrBufSize() > 0)
-      {
-         if ((CSeqNo::incseq(m_iSndCurrSeqNo) != m_iSndLastAck) && (m_pSndLossList->getLossLength() == 0))
-         {
-            // resend all unacknowledged packets on timeout, but only if there is no packet in the loss list
-            int32_t csn = m_iSndCurrSeqNo;
-            int num = m_pSndLossList->insert(m_iSndLastAck, csn);
-            m_iTraceSndLoss += num;
-            m_iSndLossTotal += num;
-         }
-
-         m_pCC->onTimeout();
-         CCUpdate();
-
-         // immediately restart transmission
-         m_pSndQueue->m_pSndUList->update(this);
-      }
-      else
-      {
-         sendCtrl(1);
-      }
-
-      ++ m_iEXPCount;
-      // Reset last response time since we just sent a heart-beat.
-      m_ullLastRspTime = currtime;
-   }
-}
-
-void CUDT::addEPoll(const int eid)
-{
-   CGuard::enterCS(s_UDTUnited.m_EPoll.m_EPollLock);
-   m_sPollID.insert(eid);
-   CGuard::leaveCS(s_UDTUnited.m_EPoll.m_EPollLock);
-
-   if (!m_bConnected || m_bBroken || m_bClosing)
-      return;
-
-   if (((UDT_STREAM == m_iSockType) && (m_pRcvBuffer->getRcvDataSize() > 0)) ||
-      ((UDT_DGRAM == m_iSockType) && (m_pRcvBuffer->getRcvMsgNum() > 0)))
-   {
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_IN, true);
-   }
-   if (m_iSndBufSize > m_pSndBuffer->getCurrBufSize())
-   {
-      s_UDTUnited.m_EPoll.update_events(m_SocketID, m_sPollID, UDT_EPOLL_OUT, true);
-   }
-}
-
-void CUDT::removeEPoll(const int eid)
-{
-   // clear IO events notifications;
-   // since this happens after the epoll ID has been removed, they cannot be set again
-   set<int> remove;
-   remove.insert(eid);
-   s_UDTUnited.m_EPoll.update_events(m_SocketID, remove, UDT_EPOLL_IN | UDT_EPOLL_OUT, false);
-
-   CGuard::enterCS(s_UDTUnited.m_EPoll.m_EPollLock);
-   m_sPollID.erase(eid);
-   CGuard::leaveCS(s_UDTUnited.m_EPoll.m_EPollLock);
-}
diff --git a/vendor/udt4/src/core.h b/vendor/udt4/src/core.h
deleted file mode 100644
index 47caa79..0000000
--- a/vendor/udt4/src/core.h
+++ /dev/null
@@ -1,458 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 02/28/2012
-*****************************************************************************/
-
-#ifndef __UDT_CORE_H__
-#define __UDT_CORE_H__
-
-
-#include "udt.h"
-#include "common.h"
-#include "list.h"
-#include "buffer.h"
-#include "window.h"
-#include "packet.h"
-#include "channel.h"
-#include "api.h"
-#include "ccc.h"
-#include "cache.h"
-#include "queue.h"
-
-enum UDTSockType {UDT_STREAM = 1, UDT_DGRAM};
-
-class CUDT
-{
-friend class CUDTSocket;
-friend class CUDTUnited;
-friend class CCC;
-friend struct CUDTComp;
-friend class CCache<CInfoBlock>;
-friend class CRendezvousQueue;
-friend class CSndQueue;
-friend class CRcvQueue;
-friend class CSndUList;
-friend class CRcvUList;
-
-private: // constructor and desctructor
-   CUDT();
-   CUDT(const CUDT& ancestor);
-   const CUDT& operator=(const CUDT&) {return *this;}
-   ~CUDT();
-
-public: //API
-   static int startup();
-   static int cleanup();
-   static UDTSOCKET socket(int af, int type = SOCK_STREAM, int protocol = 0);
-   static int bind(UDTSOCKET u, const sockaddr* name, int namelen);
-   static int bind(UDTSOCKET u, UDPSOCKET udpsock);
-   static int listen(UDTSOCKET u, int backlog);
-   static UDTSOCKET accept(UDTSOCKET u, sockaddr* addr, int* addrlen);
-   static int connect(UDTSOCKET u, const sockaddr* name, int namelen);
-   static int close(UDTSOCKET u);
-   static int getpeername(UDTSOCKET u, sockaddr* name, int* namelen);
-   static int getsockname(UDTSOCKET u, sockaddr* name, int* namelen);
-   static int getsockopt(UDTSOCKET u, int level, UDTOpt optname, void* optval, int* optlen);
-   static int setsockopt(UDTSOCKET u, int level, UDTOpt optname, const void* optval, int optlen);
-   static int send(UDTSOCKET u, const char* buf, int len, int flags);
-   static int recv(UDTSOCKET u, char* buf, int len, int flags);
-   static int sendmsg(UDTSOCKET u, const char* buf, int len, int ttl = -1, bool inorder = false);
-   static int recvmsg(UDTSOCKET u, char* buf, int len);
-   static int64_t sendfile(UDTSOCKET u, std::fstream& ifs, int64_t& offset, int64_t size, int block = 364000);
-   static int64_t recvfile(UDTSOCKET u, std::fstream& ofs, int64_t& offset, int64_t size, int block = 7280000);
-   static int select(int nfds, ud_set* readfds, ud_set* writefds, ud_set* exceptfds, const timeval* timeout);
-   static int selectEx(const std::vector<UDTSOCKET>& fds, std::vector<UDTSOCKET>* readfds, std::vector<UDTSOCKET>* writefds, std::vector<UDTSOCKET>* exceptfds, int64_t msTimeOut);
-   static int epoll_create();
-   static int epoll_add_usock(const int eid, const UDTSOCKET u, const int* events = NULL);
-   static int epoll_add_ssock(const int eid, const SYSSOCKET s, const int* events = NULL);
-   static int epoll_remove_usock(const int eid, const UDTSOCKET u);
-   static int epoll_remove_ssock(const int eid, const SYSSOCKET s);
-   static int epoll_wait(const int eid, std::set<UDTSOCKET>* readfds, std::set<UDTSOCKET>* writefds, int64_t msTimeOut, std::set<SYSSOCKET>* lrfds = NULL, std::set<SYSSOCKET>* wrfds = NULL);
-   static int epoll_release(const int eid);
-   static CUDTException& getlasterror();
-   static int perfmon(UDTSOCKET u, CPerfMon* perf, bool clear = true);
-   static UDTSTATUS getsockstate(UDTSOCKET u);
-
-public: // internal API
-   static CUDT* getUDTHandle(UDTSOCKET u);
-
-private:
-      // Functionality:
-      //    initialize a UDT entity and bind to a local address.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void open();
-
-      // Functionality:
-      //    Start listening to any connection request.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void listen();
-
-      // Functionality:
-      //    Connect to a UDT entity listening at address "peer".
-      // Parameters:
-      //    0) [in] peer: The address of the listening UDT entity.
-      // Returned value:
-      //    None.
-
-   void connect(const sockaddr* peer);
-
-      // Functionality:
-      //    Process the response handshake packet.
-      // Parameters:
-      //    0) [in] pkt: handshake packet.
-      // Returned value:
-      //    Return 0 if connected, positive value if connection is in progress, otherwise error code.
-
-   int connect(const CPacket& pkt) throw ();
-
-      // Functionality:
-      //    Connect to a UDT entity listening at address "peer", which has sent "hs" request.
-      // Parameters:
-      //    0) [in] peer: The address of the listening UDT entity.
-      //    1) [in/out] hs: The handshake information sent by the peer side (in), negotiated value (out).
-      // Returned value:
-      //    None.
-
-   void connect(const sockaddr* peer, CHandShake* hs);
-
-      // Functionality:
-      //    Close the opened UDT entity.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void close();
-
-      // Functionality:
-      //    Request UDT to send out a data block "data" with size of "len".
-      // Parameters:
-      //    0) [in] data: The address of the application data to be sent.
-      //    1) [in] len: The size of the data block.
-      // Returned value:
-      //    Actual size of data sent.
-
-   int send(const char* data, int len);
-
-      // Functionality:
-      //    Request UDT to receive data to a memory block "data" with size of "len".
-      // Parameters:
-      //    0) [out] data: data received.
-      //    1) [in] len: The desired size of data to be received.
-      // Returned value:
-      //    Actual size of data received.
-
-   int recv(char* data, int len);
-
-      // Functionality:
-      //    send a message of a memory block "data" with size of "len".
-      // Parameters:
-      //    0) [out] data: data received.
-      //    1) [in] len: The desired size of data to be received.
-      //    2) [in] ttl: the time-to-live of the message.
-      //    3) [in] inorder: if the message should be delivered in order.
-      // Returned value:
-      //    Actual size of data sent.
-
-   int sendmsg(const char* data, int len, int ttl, bool inorder);
-
-      // Functionality:
-      //    Receive a message to buffer "data".
-      // Parameters:
-      //    0) [out] data: data received.
-      //    1) [in] len: size of the buffer.
-      // Returned value:
-      //    Actual size of data received.
-
-   int recvmsg(char* data, int len);
-
-      // Functionality:
-      //    Request UDT to send out a file described as "fd", starting from "offset", with size of "size".
-      // Parameters:
-      //    0) [in] ifs: The input file stream.
-      //    1) [in, out] offset: From where to read and send data; output is the new offset when the call returns.
-      //    2) [in] size: How many data to be sent.
-      //    3) [in] block: size of block per read from disk
-      // Returned value:
-      //    Actual size of data sent.
-
-   int64_t sendfile(std::fstream& ifs, int64_t& offset, int64_t size, int block = 366000);
-
-      // Functionality:
-      //    Request UDT to receive data into a file described as "fd", starting from "offset", with expected size of "size".
-      // Parameters:
-      //    0) [out] ofs: The output file stream.
-      //    1) [in, out] offset: From where to write data; output is the new offset when the call returns.
-      //    2) [in] size: How many data to be received.
-      //    3) [in] block: size of block per write to disk
-      // Returned value:
-      //    Actual size of data received.
-
-   int64_t recvfile(std::fstream& ofs, int64_t& offset, int64_t size, int block = 7320000);
-
-      // Functionality:
-      //    Configure UDT options.
-      // Parameters:
-      //    0) [in] optName: The enum name of a UDT option.
-      //    1) [in] optval: The value to be set.
-      //    2) [in] optlen: size of "optval".
-      // Returned value:
-      //    None.
-
-   void setOpt(UDTOpt optName, const void* optval, int optlen);
-
-      // Functionality:
-      //    Read UDT options.
-      // Parameters:
-      //    0) [in] optName: The enum name of a UDT option.
-      //    1) [in] optval: The value to be returned.
-      //    2) [out] optlen: size of "optval".
-      // Returned value:
-      //    None.
-
-   void getOpt(UDTOpt optName, void* optval, int& optlen);
-
-      // Functionality:
-      //    read the performance data since last sample() call.
-      // Parameters:
-      //    0) [in, out] perf: pointer to a CPerfMon structure to record the performance data.
-      //    1) [in] clear: flag to decide if the local performance trace should be cleared.
-      // Returned value:
-      //    None.
-
-   void sample(CPerfMon* perf, bool clear = true);
-
-private:
-   static CUDTUnited s_UDTUnited;               // UDT global management base
-
-public:
-   static const UDTSOCKET INVALID_SOCK;         // invalid socket descriptor
-   static const int ERROR;                      // socket api error returned value
-
-private: // Identification
-   UDTSOCKET m_SocketID;                        // UDT socket number
-   UDTSockType m_iSockType;                     // Type of the UDT connection (SOCK_STREAM or SOCK_DGRAM)
-   UDTSOCKET m_PeerID;				// peer id, for multiplexer
-   static const int m_iVersion;                 // UDT version, for compatibility use
-
-private: // Packet sizes
-   int m_iPktSize;                              // Maximum/regular packet size, in bytes
-   int m_iPayloadSize;                          // Maximum/regular payload size, in bytes
-
-private: // Options
-   int m_iMSS;                                  // Maximum Segment Size, in bytes
-   bool m_bSynSending;                          // Sending syncronization mode
-   bool m_bSynRecving;                          // Receiving syncronization mode
-   int m_iFlightFlagSize;                       // Maximum number of packets in flight from the peer side
-   int m_iSndBufSize;                           // Maximum UDT sender buffer size
-   int m_iRcvBufSize;                           // Maximum UDT receiver buffer size
-   linger m_Linger;                             // Linger information on close
-   int m_iUDPSndBufSize;                        // UDP sending buffer size
-   int m_iUDPRcvBufSize;                        // UDP receiving buffer size
-   int m_iIPversion;                            // IP version
-   bool m_bRendezvous;                          // Rendezvous connection mode
-   int m_iSndTimeOut;                           // sending timeout in milliseconds
-   int m_iRcvTimeOut;                           // receiving timeout in milliseconds
-   bool m_bReuseAddr;				// reuse an exiting port or not, for UDP multiplexer
-   int64_t m_llMaxBW;				// maximum data transfer rate (threshold)
-
-private: // congestion control
-   CCCVirtualFactory* m_pCCFactory;             // Factory class to create a specific CC instance
-   CCC* m_pCC;                                  // congestion control class
-   CCache<CInfoBlock>* m_pCache;		// network information cache
-
-private: // Status
-   volatile bool m_bListening;                  // If the UDT entit is listening to connection
-   volatile bool m_bConnecting;			// The short phase when connect() is called but not yet completed
-   volatile bool m_bConnected;                  // Whether the connection is on or off
-   volatile bool m_bClosing;                    // If the UDT entity is closing
-   volatile bool m_bShutdown;                   // If the peer side has shutdown the connection
-   volatile bool m_bBroken;                     // If the connection has been broken
-   volatile bool m_bPeerHealth;                 // If the peer status is normal
-   bool m_bOpened;                              // If the UDT entity has been opened
-   int m_iBrokenCounter;			// a counter (number of GC checks) to let the GC tag this socket as disconnected
-
-   int m_iEXPCount;                             // Expiration counter
-   int m_iBandwidth;                            // Estimated bandwidth, number of packets per second
-   int m_iRTT;                                  // RTT, in microseconds
-   int m_iRTTVar;                               // RTT variance
-   int m_iDeliveryRate;				// Packet arrival rate at the receiver side
-
-   uint64_t m_ullLingerExpiration;		// Linger expiration time (for GC to close a socket with data in sending buffer)
-
-   CHandShake m_ConnReq;			// connection request
-   CHandShake m_ConnRes;			// connection response
-   int64_t m_llLastReqTime;			// last time when a connection request is sent
-
-private: // Sending related data
-   CSndBuffer* m_pSndBuffer;                    // Sender buffer
-   CSndLossList* m_pSndLossList;                // Sender loss list
-   CPktTimeWindow* m_pSndTimeWindow;            // Packet sending time window
-
-   volatile uint64_t m_ullInterval;             // Inter-packet time, in CPU clock cycles
-   uint64_t m_ullTimeDiff;                      // aggregate difference in inter-packet time
-
-   volatile int m_iFlowWindowSize;              // Flow control window size
-   volatile double m_dCongestionWindow;         // congestion window size
-
-   volatile int32_t m_iSndLastAck;              // Last ACK received
-   volatile int32_t m_iSndLastDataAck;          // The real last ACK that updates the sender buffer and loss list
-   volatile int32_t m_iSndCurrSeqNo;            // The largest sequence number that has been sent
-   int32_t m_iLastDecSeq;                       // Sequence number sent last decrease occurs
-   int32_t m_iSndLastAck2;                      // Last ACK2 sent back
-   uint64_t m_ullSndLastAck2Time;               // The time when last ACK2 was sent back
-
-   int32_t m_iISN;                              // Initial Sequence Number
-
-   void CCUpdate();
-
-private: // Receiving related data
-   CRcvBuffer* m_pRcvBuffer;                    // Receiver buffer
-   CRcvLossList* m_pRcvLossList;                // Receiver loss list
-   CACKWindow* m_pACKWindow;                    // ACK history window
-   CPktTimeWindow* m_pRcvTimeWindow;            // Packet arrival time window
-
-   int32_t m_iRcvLastAck;                       // Last sent ACK
-   uint64_t m_ullLastAckTime;                   // Timestamp of last ACK
-   int32_t m_iRcvLastAckAck;                    // Last sent ACK that has been acknowledged
-   int32_t m_iAckSeqNo;                         // Last ACK sequence number
-   int32_t m_iRcvCurrSeqNo;                     // Largest received sequence number
-
-   uint64_t m_ullLastWarningTime;               // Last time that a warning message is sent
-
-   int32_t m_iPeerISN;                          // Initial Sequence Number of the peer side
-
-private: // synchronization: mutexes and conditions
-   pthread_mutex_t m_ConnectionLock;            // used to synchronize connection operation
-
-   pthread_cond_t m_SendBlockCond;              // used to block "send" call
-   pthread_mutex_t m_SendBlockLock;             // lock associated to m_SendBlockCond
-
-   pthread_mutex_t m_AckLock;                   // used to protected sender's loss list when processing ACK
-
-   pthread_cond_t m_RecvDataCond;               // used to block "recv" when there is no data
-   pthread_mutex_t m_RecvDataLock;              // lock associated to m_RecvDataCond
-
-   pthread_mutex_t m_SendLock;                  // used to synchronize "send" call
-   pthread_mutex_t m_RecvLock;                  // used to synchronize "recv" call
-
-   void initSynch();
-   void destroySynch();
-   void releaseSynch();
-
-private: // Generation and processing of packets
-   void sendCtrl(int pkttype, void* lparam = NULL, void* rparam = NULL, int size = 0);
-   void processCtrl(CPacket& ctrlpkt);
-   int packData(CPacket& packet, uint64_t& ts);
-   int processData(CUnit* unit);
-   int listen(sockaddr* addr, CPacket& packet);
-
-private: // Trace
-   uint64_t m_StartTime;                        // timestamp when the UDT entity is started
-   int64_t m_llSentTotal;                       // total number of sent data packets, including retransmissions
-   int64_t m_llRecvTotal;                       // total number of received packets
-   int m_iSndLossTotal;                         // total number of lost packets (sender side)
-   int m_iRcvLossTotal;                         // total number of lost packets (receiver side)
-   int m_iRetransTotal;                         // total number of retransmitted packets
-   int m_iSentACKTotal;                         // total number of sent ACK packets
-   int m_iRecvACKTotal;                         // total number of received ACK packets
-   int m_iSentNAKTotal;                         // total number of sent NAK packets
-   int m_iRecvNAKTotal;                         // total number of received NAK packets
-   int64_t m_llSndDurationTotal;		// total real time for sending
-
-   uint64_t m_LastSampleTime;                   // last performance sample time
-   int64_t m_llTraceSent;                       // number of pakctes sent in the last trace interval
-   int64_t m_llTraceRecv;                       // number of pakctes received in the last trace interval
-   int m_iTraceSndLoss;                         // number of lost packets in the last trace interval (sender side)
-   int m_iTraceRcvLoss;                         // number of lost packets in the last trace interval (receiver side)
-   int m_iTraceRetrans;                         // number of retransmitted packets in the last trace interval
-   int m_iSentACK;                              // number of ACKs sent in the last trace interval
-   int m_iRecvACK;                              // number of ACKs received in the last trace interval
-   int m_iSentNAK;                              // number of NAKs sent in the last trace interval
-   int m_iRecvNAK;                              // number of NAKs received in the last trace interval
-   int64_t m_llSndDuration;			// real time for sending
-   int64_t m_llSndDurationCounter;		// timers to record the sending duration
-
-private: // Timers
-   uint64_t m_ullCPUFrequency;                  // CPU clock frequency, used for Timer, ticks per microsecond
-
-   static const int m_iSYNInterval;             // Periodical Rate Control Interval, 10000 microsecond
-   static const int m_iSelfClockInterval;       // ACK interval for self-clocking
-
-   uint64_t m_ullNextACKTime;			// Next ACK time, in CPU clock cycles, same below
-   uint64_t m_ullNextNAKTime;			// Next NAK time
-
-   volatile uint64_t m_ullSYNInt;		// SYN interval
-   volatile uint64_t m_ullACKInt;		// ACK interval
-   volatile uint64_t m_ullNAKInt;		// NAK interval
-   volatile uint64_t m_ullLastRspTime;		// time stamp of last response from the peer
-
-   uint64_t m_ullMinNakInt;			// NAK timeout lower bound; too small value can cause unnecessary retransmission
-   uint64_t m_ullMinExpInt;			// timeout lower bound threshold: too small timeout can cause problem
-
-   int m_iPktCount;				// packet counter for ACK
-   int m_iLightACKCount;			// light ACK counter
-
-   uint64_t m_ullTargetTime;			// scheduled time of next packet sending
-
-   void checkTimers();
-
-private: // for UDP multiplexer
-   CSndQueue* m_pSndQueue;			// packet sending queue
-   CRcvQueue* m_pRcvQueue;			// packet receiving queue
-   sockaddr* m_pPeerAddr;			// peer address
-   uint32_t m_piSelfIP[4];			// local UDP IP address
-   CSNode* m_pSNode;				// node information for UDT list used in snd queue
-   CRNode* m_pRNode;                            // node information for UDT list used in rcv queue
-
-private: // for epoll
-   std::set<int> m_sPollID;                     // set of epoll ID to trigger
-   void addEPoll(const int eid);
-   void removeEPoll(const int eid);
-};
-
-
-#endif
diff --git a/vendor/udt4/src/epoll.cpp b/vendor/udt4/src/epoll.cpp
deleted file mode 100644
index 0e7ddb1..0000000
--- a/vendor/udt4/src/epoll.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/01/2011
-*****************************************************************************/
-
-#ifdef LINUX
-   #include <sys/epoll.h>
-   #include <unistd.h>
-#endif
-#include <algorithm>
-#include <cerrno>
-#include <cstring>
-#include <iterator>
-
-#include "common.h"
-#include "epoll.h"
-#include "udt.h"
-
-using namespace std;
-
-CEPoll::CEPoll():
-m_iIDSeed(0)
-{
-   CGuard::createMutex(m_EPollLock);
-}
-
-CEPoll::~CEPoll()
-{
-   CGuard::releaseMutex(m_EPollLock);
-}
-
-int CEPoll::create()
-{
-   CGuard pg(m_EPollLock);
-
-   int localid = 0;
-
-   #ifdef LINUX
-   localid = epoll_create(1024);
-   if (localid < 0)
-      throw CUDTException(-1, 0, errno);
-   #else
-   // on BSD, use kqueue
-   // on Solaris, use /dev/poll
-   // on Windows, select
-   #endif
-
-   if (++ m_iIDSeed >= 0x7FFFFFFF)
-      m_iIDSeed = 0;
-
-   CEPollDesc desc;
-   desc.m_iID = m_iIDSeed;
-   desc.m_iLocalID = localid;
-   m_mPolls[desc.m_iID] = desc;
-
-   return desc.m_iID;
-}
-
-int CEPoll::add_usock(const int eid, const UDTSOCKET& u, const int* events)
-{
-   CGuard pg(m_EPollLock);
-
-   map<int, CEPollDesc>::iterator p = m_mPolls.find(eid);
-   if (p == m_mPolls.end())
-      throw CUDTException(5, 13);
-
-   if (!events || (*events & UDT_EPOLL_IN))
-      p->second.m_sUDTSocksIn.insert(u);
-   if (!events || (*events & UDT_EPOLL_OUT))
-      p->second.m_sUDTSocksOut.insert(u);
-
-   return 0;
-}
-
-int CEPoll::add_ssock(const int eid, const SYSSOCKET& s, const int* events)
-{
-   CGuard pg(m_EPollLock);
-
-   map<int, CEPollDesc>::iterator p = m_mPolls.find(eid);
-   if (p == m_mPolls.end())
-      throw CUDTException(5, 13);
-
-#ifdef LINUX
-   epoll_event ev;
-   memset(&ev, 0, sizeof(epoll_event));
-
-   if (NULL == events)
-      ev.events = EPOLLIN | EPOLLOUT | EPOLLERR;
-   else
-   {
-      ev.events = 0;
-      if (*events & UDT_EPOLL_IN)
-         ev.events |= EPOLLIN;
-      if (*events & UDT_EPOLL_OUT)
-         ev.events |= EPOLLOUT;
-      if (*events & UDT_EPOLL_ERR)
-         ev.events |= EPOLLERR;
-   }
-
-   ev.data.fd = s;
-   if (::epoll_ctl(p->second.m_iLocalID, EPOLL_CTL_ADD, s, &ev) < 0)
-      throw CUDTException();
-#endif
-
-   p->second.m_sLocals.insert(s);
-
-   return 0;
-}
-
-int CEPoll::remove_usock(const int eid, const UDTSOCKET& u)
-{
-   CGuard pg(m_EPollLock);
-
-   map<int, CEPollDesc>::iterator p = m_mPolls.find(eid);
-   if (p == m_mPolls.end())
-      throw CUDTException(5, 13);
-
-   p->second.m_sUDTSocksIn.erase(u);
-   p->second.m_sUDTSocksOut.erase(u);
-   p->second.m_sUDTSocksEx.erase(u);
-
-   return 0;
-}
-
-int CEPoll::remove_ssock(const int eid, const SYSSOCKET& s)
-{
-   CGuard pg(m_EPollLock);
-
-   map<int, CEPollDesc>::iterator p = m_mPolls.find(eid);
-   if (p == m_mPolls.end())
-      throw CUDTException(5, 13);
-
-#ifdef LINUX
-   epoll_event ev;  // ev is ignored, for compatibility with old Linux kernel only.
-   if (::epoll_ctl(p->second.m_iLocalID, EPOLL_CTL_DEL, s, &ev) < 0)
-      throw CUDTException();
-#endif
-
-   p->second.m_sLocals.erase(s);
-
-   return 0;
-}
-
-int CEPoll::wait(const int eid, set<UDTSOCKET>* readfds, set<UDTSOCKET>* writefds, int64_t msTimeOut, set<SYSSOCKET>* lrfds, set<SYSSOCKET>* lwfds)
-{
-   // if all fields is NULL and waiting time is infinite, then this would be a deadlock
-   if (!readfds && !writefds && !lrfds && lwfds && (msTimeOut < 0))
-      throw CUDTException(5, 3, 0);
-
-   // Clear these sets in case the app forget to do it.
-   if (readfds) readfds->clear();
-   if (writefds) writefds->clear();
-   if (lrfds) lrfds->clear();
-   if (lwfds) lwfds->clear();
-
-   int total = 0;
-
-   int64_t entertime = CTimer::getTime();
-   while (true)
-   {
-      CGuard::enterCS(m_EPollLock);
-
-      map<int, CEPollDesc>::iterator p = m_mPolls.find(eid);
-      if (p == m_mPolls.end())
-      {
-         CGuard::leaveCS(m_EPollLock);
-         throw CUDTException(5, 13);
-      }
-
-      if (p->second.m_sUDTSocksIn.empty() && p->second.m_sUDTSocksOut.empty() && p->second.m_sLocals.empty() && (msTimeOut < 0))
-      {
-         // no socket is being monitored, this may be a deadlock
-         CGuard::leaveCS(m_EPollLock);
-         throw CUDTException(5, 3);
-      }
-
-      // Sockets with exceptions are returned to both read and write sets.
-      if ((NULL != readfds) && (!p->second.m_sUDTReads.empty() || !p->second.m_sUDTExcepts.empty()))
-      {
-         *readfds = p->second.m_sUDTReads;
-         for (set<UDTSOCKET>::const_iterator i = p->second.m_sUDTExcepts.begin(); i != p->second.m_sUDTExcepts.end(); ++ i)
-            readfds->insert(*i);
-         total += p->second.m_sUDTReads.size() + p->second.m_sUDTExcepts.size();
-      }
-      if ((NULL != writefds) && (!p->second.m_sUDTWrites.empty() || !p->second.m_sUDTExcepts.empty()))
-      {
-         *writefds = p->second.m_sUDTWrites;
-         for (set<UDTSOCKET>::const_iterator i = p->second.m_sUDTExcepts.begin(); i != p->second.m_sUDTExcepts.end(); ++ i)
-            writefds->insert(*i);
-         total += p->second.m_sUDTWrites.size() + p->second.m_sUDTExcepts.size();
-      }
-
-      if (lrfds || lwfds)
-      {
-         #ifdef LINUX
-         const int max_events = p->second.m_sLocals.size();
-         epoll_event ev[max_events];
-         int nfds = ::epoll_wait(p->second.m_iLocalID, ev, max_events, 0);
-
-         for (int i = 0; i < nfds; ++ i)
-         {
-            if ((NULL != lrfds) && (ev[i].events & EPOLLIN))
-           {
-               lrfds->insert(ev[i].data.fd);
-               ++ total;
-            }
-            if ((NULL != lwfds) && (ev[i].events & EPOLLOUT))
-            {
-               lwfds->insert(ev[i].data.fd);
-               ++ total;
-            }
-         }
-         #else
-         //currently "select" is used for all non-Linux platforms.
-         //faster approaches can be applied for specific systems in the future.
-
-         //"select" has a limitation on the number of sockets
-
-         fd_set readfds;
-         fd_set writefds;
-         FD_ZERO(&readfds);
-         FD_ZERO(&writefds);
-
-         for (set<SYSSOCKET>::const_iterator i = p->second.m_sLocals.begin(); i != p->second.m_sLocals.end(); ++ i)
-         {
-            if (lrfds)
-               FD_SET(*i, &readfds);
-            if (lwfds)
-               FD_SET(*i, &writefds);
-         }
-
-         timeval tv;
-         tv.tv_sec = 0;
-         tv.tv_usec = 0;
-         if (::select(0, &readfds, &writefds, NULL, &tv) > 0)
-         {
-            for (set<SYSSOCKET>::const_iterator i = p->second.m_sLocals.begin(); i != p->second.m_sLocals.end(); ++ i)
-            {
-               if (lrfds && FD_ISSET(*i, &readfds))
-               {
-                  lrfds->insert(*i);
-                  ++ total;
-               }
-               if (lwfds && FD_ISSET(*i, &writefds))
-               {
-                  lwfds->insert(*i);
-                  ++ total;
-               }
-            }
-         }
-         #endif
-      }
-
-      CGuard::leaveCS(m_EPollLock);
-
-      if (total > 0)
-         return total;
-
-      if ((msTimeOut >= 0) && (int64_t(CTimer::getTime() - entertime) >= msTimeOut * 1000LL))
-         throw CUDTException(6, 3, 0);
-
-      CTimer::waitForEvent();
-   }
-
-   return 0;
-}
-
-int CEPoll::release(const int eid)
-{
-   CGuard pg(m_EPollLock);
-
-   map<int, CEPollDesc>::iterator i = m_mPolls.find(eid);
-   if (i == m_mPolls.end())
-      throw CUDTException(5, 13);
-
-   #ifdef LINUX
-   // release local/system epoll descriptor
-   ::close(i->second.m_iLocalID);
-   #endif
-
-   m_mPolls.erase(i);
-
-   return 0;
-}
-
-namespace
-{
-
-void update_epoll_sets(const UDTSOCKET& uid, const set<UDTSOCKET>& watch, set<UDTSOCKET>& result, bool enable)
-{
-   if (enable && (watch.find(uid) != watch.end()))
-   {
-      result.insert(uid);
-   }
-   else if (!enable)
-   {
-      result.erase(uid);
-   }
-}
-
-}  // namespace
-
-int CEPoll::update_events(const UDTSOCKET& uid, std::set<int>& eids, int events, bool enable)
-{
-   CGuard pg(m_EPollLock);
-
-   map<int, CEPollDesc>::iterator p;
-
-   vector<int> lost;
-   for (set<int>::iterator i = eids.begin(); i != eids.end(); ++ i)
-   {
-      p = m_mPolls.find(*i);
-      if (p == m_mPolls.end())
-      {
-         lost.push_back(*i);
-      }
-      else
-      {
-         if ((events & UDT_EPOLL_IN) != 0)
-            update_epoll_sets(uid, p->second.m_sUDTSocksIn, p->second.m_sUDTReads, enable);
-         if ((events & UDT_EPOLL_OUT) != 0)
-            update_epoll_sets(uid, p->second.m_sUDTSocksOut, p->second.m_sUDTWrites, enable);
-         if ((events & UDT_EPOLL_ERR) != 0)
-            update_epoll_sets(uid, p->second.m_sUDTSocksEx, p->second.m_sUDTExcepts, enable);
-      }
-   }
-
-   for (vector<int>::iterator i = lost.begin(); i != lost.end(); ++ i)
-      eids.erase(*i);
-
-   return 0;
-}
diff --git a/vendor/udt4/src/epoll.h b/vendor/udt4/src/epoll.h
deleted file mode 100644
index a19f8ab..0000000
--- a/vendor/udt4/src/epoll.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2010, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 08/20/2010
-*****************************************************************************/
-
-#ifndef __UDT_EPOLL_H__
-#define __UDT_EPOLL_H__
-
-
-#include <map>
-#include <set>
-#include "udt.h"
-
-
-struct CEPollDesc
-{
-   int m_iID;                                // epoll ID
-   std::set<UDTSOCKET> m_sUDTSocksOut;       // set of UDT sockets waiting for write events
-   std::set<UDTSOCKET> m_sUDTSocksIn;        // set of UDT sockets waiting for read events
-   std::set<UDTSOCKET> m_sUDTSocksEx;        // set of UDT sockets waiting for exceptions
-
-   int m_iLocalID;                           // local system epoll ID
-   std::set<SYSSOCKET> m_sLocals;            // set of local (non-UDT) descriptors
-
-   std::set<UDTSOCKET> m_sUDTWrites;         // UDT sockets ready for write
-   std::set<UDTSOCKET> m_sUDTReads;          // UDT sockets ready for read
-   std::set<UDTSOCKET> m_sUDTExcepts;        // UDT sockets with exceptions (connection broken, etc.)
-};
-
-class CEPoll
-{
-friend class CUDT;
-friend class CRendezvousQueue;
-
-public:
-   CEPoll();
-   ~CEPoll();
-
-public: // for CUDTUnited API
-
-      // Functionality:
-      //    create a new EPoll.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    new EPoll ID if success, otherwise an error number.
-
-   int create();
-
-      // Functionality:
-      //    add a UDT socket to an EPoll.
-      // Parameters:
-      //    0) [in] eid: EPoll ID.
-      //    1) [in] u: UDT Socket ID.
-      //    2) [in] events: events to watch.
-      // Returned value:
-      //    0 if success, otherwise an error number.
-
-   int add_usock(const int eid, const UDTSOCKET& u, const int* events = NULL);
-
-      // Functionality:
-      //    add a system socket to an EPoll.
-      // Parameters:
-      //    0) [in] eid: EPoll ID.
-      //    1) [in] s: system Socket ID.
-      //    2) [in] events: events to watch.
-      // Returned value:
-      //    0 if success, otherwise an error number.
-
-   int add_ssock(const int eid, const SYSSOCKET& s, const int* events = NULL);
-
-      // Functionality:
-      //    remove a UDT socket event from an EPoll; socket will be removed if no events to watch
-      // Parameters:
-      //    0) [in] eid: EPoll ID.
-      //    1) [in] u: UDT socket ID.
-      // Returned value:
-      //    0 if success, otherwise an error number.
-
-   int remove_usock(const int eid, const UDTSOCKET& u);
-
-      // Functionality:
-      //    remove a system socket event from an EPoll; socket will be removed if no events to watch
-      // Parameters:
-      //    0) [in] eid: EPoll ID.
-      //    1) [in] s: system socket ID.
-      // Returned value:
-      //    0 if success, otherwise an error number.
-
-   int remove_ssock(const int eid, const SYSSOCKET& s);
-
-      // Functionality:
-      //    wait for EPoll events or timeout.
-      // Parameters:
-      //    0) [in] eid: EPoll ID.
-      //    1) [out] readfds: UDT sockets available for reading.
-      //    2) [out] writefds: UDT sockets available for writing.
-      //    3) [in] msTimeOut: timeout threshold, in milliseconds.
-      //    4) [out] lrfds: system file descriptors for reading.
-      //    5) [out] lwfds: system file descriptors for writing.
-      // Returned value:
-      //    number of sockets available for IO.
-
-   int wait(const int eid, std::set<UDTSOCKET>* readfds, std::set<UDTSOCKET>* writefds, int64_t msTimeOut, std::set<SYSSOCKET>* lrfds, std::set<SYSSOCKET>* lwfds);
-
-      // Functionality:
-      //    close and release an EPoll.
-      // Parameters:
-      //    0) [in] eid: EPoll ID.
-      // Returned value:
-      //    0 if success, otherwise an error number.
-
-   int release(const int eid);
-
-public: // for CUDT to acknowledge IO status
-
-      // Functionality:
-      //    Update events available for a UDT socket.
-      // Parameters:
-      //    0) [in] uid: UDT socket ID.
-      //    1) [in] eids: EPoll IDs to be set
-      //    1) [in] events: Combination of events to update
-      //    1) [in] enable: true -> enable, otherwise disable
-      // Returned value:
-      //    0 if success, otherwise an error number
-
-   int update_events(const UDTSOCKET& uid, std::set<int>& eids, int events, bool enable);
-
-private:
-   int m_iIDSeed;                            // seed to generate a new ID
-   pthread_mutex_t m_SeedLock;
-
-   std::map<int, CEPollDesc> m_mPolls;       // all epolls
-   pthread_mutex_t m_EPollLock;
-};
-
-
-#endif
diff --git a/vendor/udt4/src/list.cpp b/vendor/udt4/src/list.cpp
deleted file mode 100644
index 00b7e57..0000000
--- a/vendor/udt4/src/list.cpp
+++ /dev/null
@@ -1,703 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/22/2011
-*****************************************************************************/
-
-#include "list.h"
-
-CSndLossList::CSndLossList(int size):
-m_piData1(NULL),
-m_piData2(NULL),
-m_piNext(NULL),
-m_iHead(-1),
-m_iLength(0),
-m_iSize(size),
-m_iLastInsertPos(-1),
-m_ListLock()
-{
-   m_piData1 = new int32_t [m_iSize];
-   m_piData2 = new int32_t [m_iSize];
-   m_piNext = new int [m_iSize];
-
-   // -1 means there is no data in the node
-   for (int i = 0; i < size; ++ i)
-   {
-      m_piData1[i] = -1;
-      m_piData2[i] = -1;
-   }
-
-   // sender list needs mutex protection
-   #ifndef WIN32
-      pthread_mutex_init(&m_ListLock, 0);
-   #else
-      m_ListLock = CreateMutex(NULL, false, NULL);
-   #endif
-}
-
-CSndLossList::~CSndLossList()
-{
-   delete [] m_piData1;
-   delete [] m_piData2;
-   delete [] m_piNext;
-
-   #ifndef WIN32
-      pthread_mutex_destroy(&m_ListLock);
-   #else
-      CloseHandle(m_ListLock);
-   #endif
-}
-
-int CSndLossList::insert(int32_t seqno1, int32_t seqno2)
-{
-   CGuard listguard(m_ListLock);
-
-   if (0 == m_iLength)
-   {
-      // insert data into an empty list
-
-      m_iHead = 0;
-      m_piData1[m_iHead] = seqno1;
-      if (seqno2 != seqno1)
-         m_piData2[m_iHead] = seqno2;
-
-      m_piNext[m_iHead] = -1;
-      m_iLastInsertPos = m_iHead;
-
-      m_iLength += CSeqNo::seqlen(seqno1, seqno2);
-
-      return m_iLength;
-   }
-
-   // otherwise find the position where the data can be inserted
-   int origlen = m_iLength;
-   int offset = CSeqNo::seqoff(m_piData1[m_iHead], seqno1);
-   int loc = (m_iHead + offset + m_iSize) % m_iSize;
-
-   if (offset < 0)
-   {
-      // Insert data prior to the head pointer
-
-      m_piData1[loc] = seqno1;
-      if (seqno2 != seqno1)
-         m_piData2[loc] = seqno2;
-
-      // new node becomes head
-      m_piNext[loc] = m_iHead;
-      m_iHead = loc;
-      m_iLastInsertPos = loc;
-
-      m_iLength += CSeqNo::seqlen(seqno1, seqno2);
-   }
-   else if (offset > 0)
-   {
-      if (seqno1 == m_piData1[loc])
-      {
-         m_iLastInsertPos = loc;
-
-         // first seqno is equivlent, compare the second
-         if (-1 == m_piData2[loc])
-         {
-            if (seqno2 != seqno1)
-            {
-               m_iLength += CSeqNo::seqlen(seqno1, seqno2) - 1;
-               m_piData2[loc] = seqno2;
-            }
-         }
-         else if (CSeqNo::seqcmp(seqno2, m_piData2[loc]) > 0)
-         {
-            // new seq pair is longer than old pair, e.g., insert [3, 7] to [3, 5], becomes [3, 7]
-            m_iLength += CSeqNo::seqlen(m_piData2[loc], seqno2) - 1;
-            m_piData2[loc] = seqno2;
-         }
-         else
-            // Do nothing if it is already there
-            return 0;
-      }
-      else
-      {
-         // searching the prior node
-         int i;
-         if ((-1 != m_iLastInsertPos) && (CSeqNo::seqcmp(m_piData1[m_iLastInsertPos], seqno1) < 0))
-            i = m_iLastInsertPos;
-         else
-            i = m_iHead;
-
-         while ((-1 != m_piNext[i]) && (CSeqNo::seqcmp(m_piData1[m_piNext[i]], seqno1) < 0))
-            i = m_piNext[i];
-
-         if ((-1 == m_piData2[i]) || (CSeqNo::seqcmp(m_piData2[i], seqno1) < 0))
-         {
-            m_iLastInsertPos = loc;
-
-            // no overlap, create new node
-            m_piData1[loc] = seqno1;
-            if (seqno2 != seqno1)
-               m_piData2[loc] = seqno2;
-
-            m_piNext[loc] = m_piNext[i];
-            m_piNext[i] = loc;
-
-            m_iLength += CSeqNo::seqlen(seqno1, seqno2);
-         }
-         else
-         {
-            m_iLastInsertPos = i;
-
-            // overlap, coalesce with prior node, insert(3, 7) to [2, 5], ... becomes [2, 7]
-            if (CSeqNo::seqcmp(m_piData2[i], seqno2) < 0)
-            {
-               m_iLength += CSeqNo::seqlen(m_piData2[i], seqno2) - 1;
-               m_piData2[i] = seqno2;
-
-               loc = i;
-            }
-            else
-               return 0;
-         }
-      }
-   }
-   else
-   {
-      m_iLastInsertPos = m_iHead;
-
-      // insert to head node
-      if (seqno2 != seqno1)
-      {
-         if (-1 == m_piData2[loc])
-         {
-            m_iLength += CSeqNo::seqlen(seqno1, seqno2) - 1;
-            m_piData2[loc] = seqno2;
-         }
-         else if (CSeqNo::seqcmp(seqno2, m_piData2[loc]) > 0)
-         {
-            m_iLength += CSeqNo::seqlen(m_piData2[loc], seqno2) - 1;
-            m_piData2[loc] = seqno2;
-         }
-         else 
-            return 0;
-      }
-      else
-         return 0;
-   }
-
-   // coalesce with next node. E.g., [3, 7], ..., [6, 9] becomes [3, 9] 
-   while ((-1 != m_piNext[loc]) && (-1 != m_piData2[loc]))
-   {
-      int i = m_piNext[loc];
-
-      if (CSeqNo::seqcmp(m_piData1[i], CSeqNo::incseq(m_piData2[loc])) <= 0)
-      {
-         // coalesce if there is overlap
-         if (-1 != m_piData2[i])
-         {
-            if (CSeqNo::seqcmp(m_piData2[i], m_piData2[loc]) > 0)
-            {
-               if (CSeqNo::seqcmp(m_piData2[loc], m_piData1[i]) >= 0)
-                  m_iLength -= CSeqNo::seqlen(m_piData1[i], m_piData2[loc]);
-
-               m_piData2[loc] = m_piData2[i];
-            }
-            else
-               m_iLength -= CSeqNo::seqlen(m_piData1[i], m_piData2[i]);
-         }
-         else
-         {
-            if (m_piData1[i] == CSeqNo::incseq(m_piData2[loc]))
-               m_piData2[loc] = m_piData1[i];
-            else
-               m_iLength --;
-         }
-
-         m_piData1[i] = -1;
-         m_piData2[i] = -1;
-         m_piNext[loc] = m_piNext[i];
-      }
-      else
-         break;
-   }
-
-   return m_iLength - origlen;
-}
-
-void CSndLossList::remove(int32_t seqno)
-{
-   CGuard listguard(m_ListLock);
-
-   if (0 == m_iLength)
-      return;
-
-   // Remove all from the head pointer to a node with a larger seq. no. or the list is empty
-   int offset = CSeqNo::seqoff(m_piData1[m_iHead], seqno);
-   int loc = (m_iHead + offset + m_iSize) % m_iSize;
-
-   if (0 == offset)
-   {
-      // It is the head. Remove the head and point to the next node
-      loc = (loc + 1) % m_iSize;
-
-      if (-1 == m_piData2[m_iHead])
-         loc = m_piNext[m_iHead];
-      else
-      {
-         m_piData1[loc] = CSeqNo::incseq(seqno);
-         if (CSeqNo::seqcmp(m_piData2[m_iHead], CSeqNo::incseq(seqno)) > 0)
-            m_piData2[loc] = m_piData2[m_iHead];
-
-         m_piData2[m_iHead] = -1;
-
-         m_piNext[loc] = m_piNext[m_iHead];
-      }
-
-      m_piData1[m_iHead] = -1;
-
-      if (m_iLastInsertPos == m_iHead)
-         m_iLastInsertPos = -1;
-
-      m_iHead = loc;
-
-      m_iLength --;
-   }
-   else if (offset > 0)
-   {
-      int h = m_iHead;
-
-      if (seqno == m_piData1[loc])
-      {
-         // target node is not empty, remove part/all of the seqno in the node.
-         int temp = loc;
-         loc = (loc + 1) % m_iSize;
-
-         if (-1 == m_piData2[temp])
-            m_iHead = m_piNext[temp];
-         else
-         {
-            // remove part, e.g., [3, 7] becomes [], [4, 7] after remove(3)
-            m_piData1[loc] = CSeqNo::incseq(seqno);
-            if (CSeqNo::seqcmp(m_piData2[temp], m_piData1[loc]) > 0)
-               m_piData2[loc] = m_piData2[temp];
-            m_iHead = loc;
-            m_piNext[loc] = m_piNext[temp];
-            m_piNext[temp] = loc;
-            m_piData2[temp] = -1;
-         }
-      }
-      else
-      {
-         // target node is empty, check prior node
-         int i = m_iHead;
-         while ((-1 != m_piNext[i]) && (CSeqNo::seqcmp(m_piData1[m_piNext[i]], seqno) < 0))
-            i = m_piNext[i];
-
-         loc = (loc + 1) % m_iSize;
-
-         if (-1 == m_piData2[i])
-            m_iHead = m_piNext[i];
-         else if (CSeqNo::seqcmp(m_piData2[i], seqno) > 0)
-         {
-            // remove part/all seqno in the prior node
-            m_piData1[loc] = CSeqNo::incseq(seqno);
-            if (CSeqNo::seqcmp(m_piData2[i], m_piData1[loc]) > 0)
-               m_piData2[loc] = m_piData2[i];
-
-            m_piData2[i] = seqno;
-
-            m_piNext[loc] = m_piNext[i];
-            m_piNext[i] = loc;
-
-            m_iHead = loc;
-         }
-         else
-            m_iHead = m_piNext[i];
-      }
-
-      // Remove all nodes prior to the new head
-      while (h != m_iHead)
-      {
-         if (m_piData2[h] != -1)
-         {
-            m_iLength -= CSeqNo::seqlen(m_piData1[h], m_piData2[h]);
-            m_piData2[h] = -1;
-         }
-         else
-            m_iLength --;
-
-         m_piData1[h] = -1;
-
-         if (m_iLastInsertPos == h)
-            m_iLastInsertPos = -1;
-
-         h = m_piNext[h];
-      }
-   }
-}
-
-int CSndLossList::getLossLength()
-{
-   CGuard listguard(m_ListLock);
-
-   return m_iLength;
-}
-
-int32_t CSndLossList::getLostSeq()
-{
-   if (0 == m_iLength)
-     return -1;
-
-   CGuard listguard(m_ListLock);
-
-   if (0 == m_iLength)
-     return -1;
-
-   if (m_iLastInsertPos == m_iHead)
-      m_iLastInsertPos = -1;
-
-   // return the first loss seq. no.
-   int32_t seqno = m_piData1[m_iHead];
-
-   // head moves to the next node
-   if (-1 == m_piData2[m_iHead])
-   {
-      //[3, -1] becomes [], and head moves to next node in the list
-      m_piData1[m_iHead] = -1;
-      m_iHead = m_piNext[m_iHead];
-   }
-   else
-   {
-      // shift to next node, e.g., [3, 7] becomes [], [4, 7]
-      int loc = (m_iHead + 1) % m_iSize;
-
-      m_piData1[loc] = CSeqNo::incseq(seqno);
-      if (CSeqNo::seqcmp(m_piData2[m_iHead], m_piData1[loc]) > 0)
-         m_piData2[loc] = m_piData2[m_iHead];
-
-      m_piData1[m_iHead] = -1;
-      m_piData2[m_iHead] = -1;
-
-      m_piNext[loc] = m_piNext[m_iHead];
-      m_iHead = loc;
-   }
-
-   m_iLength --;
-
-   return seqno;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-CRcvLossList::CRcvLossList(int size):
-m_piData1(NULL),
-m_piData2(NULL),
-m_piNext(NULL),
-m_piPrior(NULL),
-m_iHead(-1),
-m_iTail(-1),
-m_iLength(0),
-m_iSize(size)
-{
-   m_piData1 = new int32_t [m_iSize];
-   m_piData2 = new int32_t [m_iSize];
-   m_piNext = new int [m_iSize];
-   m_piPrior = new int [m_iSize];
-
-   // -1 means there is no data in the node
-   for (int i = 0; i < size; ++ i)
-   {
-      m_piData1[i] = -1;
-      m_piData2[i] = -1;
-   }
-}
-
-CRcvLossList::~CRcvLossList()
-{
-   delete [] m_piData1;
-   delete [] m_piData2;
-   delete [] m_piNext;
-   delete [] m_piPrior;
-}
-
-void CRcvLossList::insert(int32_t seqno1, int32_t seqno2)
-{
-   // Data to be inserted must be larger than all those in the list
-   // guaranteed by the UDT receiver
-
-   if (0 == m_iLength)
-   {
-      // insert data into an empty list
-      m_iHead = 0;
-      m_iTail = 0;
-      m_piData1[m_iHead] = seqno1;
-      if (seqno2 != seqno1)
-         m_piData2[m_iHead] = seqno2;
-
-      m_piNext[m_iHead] = -1;
-      m_piPrior[m_iHead] = -1;
-      m_iLength += CSeqNo::seqlen(seqno1, seqno2);
-
-      return;
-   }
-
-   // otherwise searching for the position where the node should be
-   int offset = CSeqNo::seqoff(m_piData1[m_iHead], seqno1);
-   int loc = (m_iHead + offset) % m_iSize;
-
-   if ((-1 != m_piData2[m_iTail]) && (CSeqNo::incseq(m_piData2[m_iTail]) == seqno1))
-   {
-      // coalesce with prior node, e.g., [2, 5], [6, 7] becomes [2, 7]
-      loc = m_iTail;
-      m_piData2[loc] = seqno2;
-   }
-   else
-   {
-      // create new node
-      m_piData1[loc] = seqno1;
-
-      if (seqno2 != seqno1)
-         m_piData2[loc] = seqno2;
-
-      m_piNext[m_iTail] = loc;
-      m_piPrior[loc] = m_iTail;
-      m_piNext[loc] = -1;
-      m_iTail = loc;
-   }
-
-   m_iLength += CSeqNo::seqlen(seqno1, seqno2);
-}
-
-bool CRcvLossList::remove(int32_t seqno)
-{
-   if (0 == m_iLength)
-      return false; 
-
-   // locate the position of "seqno" in the list
-   int offset = CSeqNo::seqoff(m_piData1[m_iHead], seqno);
-   if (offset < 0)
-      return false;
-
-   int loc = (m_iHead + offset) % m_iSize;
-
-   if (seqno == m_piData1[loc])
-   {
-      // This is a seq. no. that starts the loss sequence
-
-      if (-1 == m_piData2[loc])
-      {
-         // there is only 1 loss in the sequence, delete it from the node
-         if (m_iHead == loc)
-         {
-            m_iHead = m_piNext[m_iHead];
-            if (-1 != m_iHead)
-               m_piPrior[m_iHead] = -1;
-         }
-         else
-         {
-            m_piNext[m_piPrior[loc]] = m_piNext[loc];
-            if (-1 != m_piNext[loc])
-               m_piPrior[m_piNext[loc]] = m_piPrior[loc];
-            else
-               m_iTail = m_piPrior[loc];
-         }
-
-         m_piData1[loc] = -1;
-      }
-      else
-      {
-         // there are more than 1 loss in the sequence
-         // move the node to the next and update the starter as the next loss inSeqNo(seqno)
-
-         // find next node
-         int i = (loc + 1) % m_iSize;
-
-         // remove the "seqno" and change the starter as next seq. no.
-         m_piData1[i] = CSeqNo::incseq(m_piData1[loc]);
-
-         // process the sequence end
-         if (CSeqNo::seqcmp(m_piData2[loc], CSeqNo::incseq(m_piData1[loc])) > 0)
-            m_piData2[i] = m_piData2[loc];
-
-         // remove the current node
-         m_piData1[loc] = -1;
-         m_piData2[loc] = -1;
- 
-         // update list pointer
-         m_piNext[i] = m_piNext[loc];
-         m_piPrior[i] = m_piPrior[loc];
-
-         if (m_iHead == loc)
-            m_iHead = i;
-         else
-            m_piNext[m_piPrior[i]] = i;
-
-         if (m_iTail == loc)
-            m_iTail = i;
-         else
-            m_piPrior[m_piNext[i]] = i;
-      }
-
-      m_iLength --;
-
-      return true;
-   }
-
-   // There is no loss sequence in the current position
-   // the "seqno" may be contained in a previous node
-
-   // searching previous node
-   int i = (loc - 1 + m_iSize) % m_iSize;
-   while (-1 == m_piData1[i])
-      i = (i - 1 + m_iSize) % m_iSize;
-
-   // not contained in this node, return
-   if ((-1 == m_piData2[i]) || (CSeqNo::seqcmp(seqno, m_piData2[i]) > 0))
-       return false;
-
-   if (seqno == m_piData2[i])
-   {
-      // it is the sequence end
-
-      if (seqno == CSeqNo::incseq(m_piData1[i]))
-         m_piData2[i] = -1;
-      else
-         m_piData2[i] = CSeqNo::decseq(seqno);
-   }
-   else
-   {
-      // split the sequence
-
-      // construct the second sequence from CSeqNo::incseq(seqno) to the original sequence end
-      // located at "loc + 1"
-      loc = (loc + 1) % m_iSize;
-
-      m_piData1[loc] = CSeqNo::incseq(seqno);
-      if (CSeqNo::seqcmp(m_piData2[i], m_piData1[loc]) > 0)      
-         m_piData2[loc] = m_piData2[i];
-
-      // the first (original) sequence is between the original sequence start to CSeqNo::decseq(seqno)
-      if (seqno == CSeqNo::incseq(m_piData1[i]))
-         m_piData2[i] = -1;
-      else
-         m_piData2[i] = CSeqNo::decseq(seqno);
-
-      // update the list pointer
-      m_piNext[loc] = m_piNext[i];
-      m_piNext[i] = loc;
-      m_piPrior[loc] = i;
-
-      if (m_iTail == i)
-         m_iTail = loc;
-      else
-         m_piPrior[m_piNext[loc]] = loc;
-   }
-
-   m_iLength --;
-
-   return true;
-}
-
-bool CRcvLossList::remove(int32_t seqno1, int32_t seqno2)
-{
-   if (seqno1 <= seqno2)
-   {
-      for (int32_t i = seqno1; i <= seqno2; ++ i)
-         remove(i);
-   }
-   else
-   {
-      for (int32_t j = seqno1; j < CSeqNo::m_iMaxSeqNo; ++ j)
-         remove(j);
-      for (int32_t k = 0; k <= seqno2; ++ k)
-         remove(k);
-   }
-
-   return true;
-}
-
-bool CRcvLossList::find(int32_t seqno1, int32_t seqno2) const
-{
-   if (0 == m_iLength)
-      return false;
-
-   int p = m_iHead;
-
-   while (-1 != p)
-   {
-      if ((CSeqNo::seqcmp(m_piData1[p], seqno1) == 0) ||
-          ((CSeqNo::seqcmp(m_piData1[p], seqno1) > 0) && (CSeqNo::seqcmp(m_piData1[p], seqno2) <= 0)) ||
-          ((CSeqNo::seqcmp(m_piData1[p], seqno1) < 0) && (m_piData2[p] != -1) && CSeqNo::seqcmp(m_piData2[p], seqno1) >= 0))
-          return true;
-
-      p = m_piNext[p];
-   }
-
-   return false;
-}
-
-int CRcvLossList::getLossLength() const
-{
-   return m_iLength;
-}
-
-int CRcvLossList::getFirstLostSeq() const
-{
-   if (0 == m_iLength)
-      return -1;
-
-   return m_piData1[m_iHead];
-}
-
-void CRcvLossList::getLossArray(int32_t* array, int& len, int limit)
-{
-   len = 0;
-
-   int i = m_iHead;
-
-   while ((len < limit - 1) && (-1 != i))
-   {
-      array[len] = m_piData1[i];
-      if (-1 != m_piData2[i])
-      {
-         // there are more than 1 loss in the sequence
-         array[len] |= 0x80000000;
-         ++ len;
-         array[len] = m_piData2[i];
-      }
-
-      ++ len;
-
-      i = m_piNext[i];
-   }
-}
diff --git a/vendor/udt4/src/list.h b/vendor/udt4/src/list.h
deleted file mode 100644
index 6be9694..0000000
--- a/vendor/udt4/src/list.h
+++ /dev/null
@@ -1,202 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/22/2011
-*****************************************************************************/
-
-#ifndef __UDT_LIST_H__
-#define __UDT_LIST_H__
-
-
-#include "udt.h"
-#include "common.h"
-
-
-class CSndLossList
-{
-public:
-   CSndLossList(int size = 1024);
-   ~CSndLossList();
-
-      // Functionality:
-      //    Insert a seq. no. into the sender loss list.
-      // Parameters:
-      //    0) [in] seqno1: sequence number starts.
-      //    1) [in] seqno2: sequence number ends.
-      // Returned value:
-      //    number of packets that are not in the list previously.
-
-   int insert(int32_t seqno1, int32_t seqno2);
-
-      // Functionality:
-      //    Remove ALL the seq. no. that are not greater than the parameter.
-      // Parameters:
-      //    0) [in] seqno: sequence number.
-      // Returned value:
-      //    None.
-
-   void remove(int32_t seqno);
-
-      // Functionality:
-      //    Read the loss length.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    The length of the list.
-
-   int getLossLength();
-
-      // Functionality:
-      //    Read the first (smallest) loss seq. no. in the list and remove it.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    The seq. no. or -1 if the list is empty.
-
-   int32_t getLostSeq();
-
-private:
-   int32_t* m_piData1;                  // sequence number starts
-   int32_t* m_piData2;                  // seqnence number ends
-   int* m_piNext;                       // next node in the list
-
-   int m_iHead;                         // first node
-   int m_iLength;                       // loss length
-   int m_iSize;                         // size of the static array
-   int m_iLastInsertPos;                // position of last insert node
-
-   pthread_mutex_t m_ListLock;          // used to synchronize list operation
-
-private:
-   CSndLossList(const CSndLossList&);
-   CSndLossList& operator=(const CSndLossList&);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class CRcvLossList
-{
-public:
-   CRcvLossList(int size = 1024);
-   ~CRcvLossList();
-
-      // Functionality:
-      //    Insert a series of loss seq. no. between "seqno1" and "seqno2" into the receiver's loss list.
-      // Parameters:
-      //    0) [in] seqno1: sequence number starts.
-      //    1) [in] seqno2: seqeunce number ends.
-      // Returned value:
-      //    None.
-
-   void insert(int32_t seqno1, int32_t seqno2);
-
-      // Functionality:
-      //    Remove a loss seq. no. from the receiver's loss list.
-      // Parameters:
-      //    0) [in] seqno: sequence number.
-      // Returned value:
-      //    if the packet is removed (true) or no such lost packet is found (false).
-
-   bool remove(int32_t seqno);
-
-      // Functionality:
-      //    Remove all packets between seqno1 and seqno2.
-      // Parameters:
-      //    0) [in] seqno1: start sequence number.
-      //    1) [in] seqno2: end sequence number.
-      // Returned value:
-      //    if the packet is removed (true) or no such lost packet is found (false).
-
-   bool remove(int32_t seqno1, int32_t seqno2);
-
-      // Functionality:
-      //    Find if there is any lost packets whose sequence number falling seqno1 and seqno2.
-      // Parameters:
-      //    0) [in] seqno1: start sequence number.
-      //    1) [in] seqno2: end sequence number.
-      // Returned value:
-      //    True if found; otherwise false.
-
-   bool find(int32_t seqno1, int32_t seqno2) const;
-
-      // Functionality:
-      //    Read the loss length.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    the length of the list.
-
-   int getLossLength() const;
-
-      // Functionality:
-      //    Read the first (smallest) seq. no. in the list.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    the sequence number or -1 if the list is empty.
-
-   int getFirstLostSeq() const;
-
-      // Functionality:
-      //    Get a encoded loss array for NAK report.
-      // Parameters:
-      //    0) [out] array: the result list of seq. no. to be included in NAK.
-      //    1) [out] physical length of the result array.
-      //    2) [in] limit: maximum length of the array.
-      // Returned value:
-      //    None.
-
-   void getLossArray(int32_t* array, int& len, int limit);
-
-private:
-   int32_t* m_piData1;                  // sequence number starts
-   int32_t* m_piData2;                  // sequence number ends
-   int* m_piNext;                       // next node in the list
-   int* m_piPrior;                      // prior node in the list;
-
-   int m_iHead;                         // first node in the list
-   int m_iTail;                         // last node in the list;
-   int m_iLength;                       // loss length
-   int m_iSize;                         // size of the static array
-
-private:
-   CRcvLossList(const CRcvLossList&);
-   CRcvLossList& operator=(const CRcvLossList&);
-};
-
-
-#endif
diff --git a/vendor/udt4/src/md5.cpp b/vendor/udt4/src/md5.cpp
deleted file mode 100644
index d6fd5d3..0000000
--- a/vendor/udt4/src/md5.cpp
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
-  Copyright (C) 1999, 2000, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/* $Id: md5.cpp,v 1.3 2008/01/20 22:52:04 lilyco Exp $ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.c is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Clarified derivation from RFC 1321; now handles byte order
-	either statically or dynamically; added missing #include <string.h>
-	in library.
-  2002-03-11 lpd Corrected argument list for main(), and added int return
-	type, in test program and T value program.
-  2002-02-21 lpd Added missing #include <stdio.h> in test program.
-  2000-07-03 lpd Patched to eliminate warnings about "constant is
-	unsigned in ANSI C, signed in traditional"; made test program
-	self-checking.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
-  1999-05-03 lpd Original version.
- */
-
-#include "md5.h"
-#include <string.h>
-
-#undef BYTE_ORDER	/* 1 = big-endian, -1 = little-endian, 0 = unknown */
-#ifdef ARCH_IS_BIG_ENDIAN
-#  define BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
-#else
-#  define BYTE_ORDER 0
-#endif
-
-#define T_MASK ((md5_word_t)~0)
-#define T1 /* 0xd76aa478 */ (T_MASK ^ 0x28955b87)
-#define T2 /* 0xe8c7b756 */ (T_MASK ^ 0x173848a9)
-#define T3    0x242070db
-#define T4 /* 0xc1bdceee */ (T_MASK ^ 0x3e423111)
-#define T5 /* 0xf57c0faf */ (T_MASK ^ 0x0a83f050)
-#define T6    0x4787c62a
-#define T7 /* 0xa8304613 */ (T_MASK ^ 0x57cfb9ec)
-#define T8 /* 0xfd469501 */ (T_MASK ^ 0x02b96afe)
-#define T9    0x698098d8
-#define T10 /* 0x8b44f7af */ (T_MASK ^ 0x74bb0850)
-#define T11 /* 0xffff5bb1 */ (T_MASK ^ 0x0000a44e)
-#define T12 /* 0x895cd7be */ (T_MASK ^ 0x76a32841)
-#define T13    0x6b901122
-#define T14 /* 0xfd987193 */ (T_MASK ^ 0x02678e6c)
-#define T15 /* 0xa679438e */ (T_MASK ^ 0x5986bc71)
-#define T16    0x49b40821
-#define T17 /* 0xf61e2562 */ (T_MASK ^ 0x09e1da9d)
-#define T18 /* 0xc040b340 */ (T_MASK ^ 0x3fbf4cbf)
-#define T19    0x265e5a51
-#define T20 /* 0xe9b6c7aa */ (T_MASK ^ 0x16493855)
-#define T21 /* 0xd62f105d */ (T_MASK ^ 0x29d0efa2)
-#define T22    0x02441453
-#define T23 /* 0xd8a1e681 */ (T_MASK ^ 0x275e197e)
-#define T24 /* 0xe7d3fbc8 */ (T_MASK ^ 0x182c0437)
-#define T25    0x21e1cde6
-#define T26 /* 0xc33707d6 */ (T_MASK ^ 0x3cc8f829)
-#define T27 /* 0xf4d50d87 */ (T_MASK ^ 0x0b2af278)
-#define T28    0x455a14ed
-#define T29 /* 0xa9e3e905 */ (T_MASK ^ 0x561c16fa)
-#define T30 /* 0xfcefa3f8 */ (T_MASK ^ 0x03105c07)
-#define T31    0x676f02d9
-#define T32 /* 0x8d2a4c8a */ (T_MASK ^ 0x72d5b375)
-#define T33 /* 0xfffa3942 */ (T_MASK ^ 0x0005c6bd)
-#define T34 /* 0x8771f681 */ (T_MASK ^ 0x788e097e)
-#define T35    0x6d9d6122
-#define T36 /* 0xfde5380c */ (T_MASK ^ 0x021ac7f3)
-#define T37 /* 0xa4beea44 */ (T_MASK ^ 0x5b4115bb)
-#define T38    0x4bdecfa9
-#define T39 /* 0xf6bb4b60 */ (T_MASK ^ 0x0944b49f)
-#define T40 /* 0xbebfbc70 */ (T_MASK ^ 0x4140438f)
-#define T41    0x289b7ec6
-#define T42 /* 0xeaa127fa */ (T_MASK ^ 0x155ed805)
-#define T43 /* 0xd4ef3085 */ (T_MASK ^ 0x2b10cf7a)
-#define T44    0x04881d05
-#define T45 /* 0xd9d4d039 */ (T_MASK ^ 0x262b2fc6)
-#define T46 /* 0xe6db99e5 */ (T_MASK ^ 0x1924661a)
-#define T47    0x1fa27cf8
-#define T48 /* 0xc4ac5665 */ (T_MASK ^ 0x3b53a99a)
-#define T49 /* 0xf4292244 */ (T_MASK ^ 0x0bd6ddbb)
-#define T50    0x432aff97
-#define T51 /* 0xab9423a7 */ (T_MASK ^ 0x546bdc58)
-#define T52 /* 0xfc93a039 */ (T_MASK ^ 0x036c5fc6)
-#define T53    0x655b59c3
-#define T54 /* 0x8f0ccc92 */ (T_MASK ^ 0x70f3336d)
-#define T55 /* 0xffeff47d */ (T_MASK ^ 0x00100b82)
-#define T56 /* 0x85845dd1 */ (T_MASK ^ 0x7a7ba22e)
-#define T57    0x6fa87e4f
-#define T58 /* 0xfe2ce6e0 */ (T_MASK ^ 0x01d3191f)
-#define T59 /* 0xa3014314 */ (T_MASK ^ 0x5cfebceb)
-#define T60    0x4e0811a1
-#define T61 /* 0xf7537e82 */ (T_MASK ^ 0x08ac817d)
-#define T62 /* 0xbd3af235 */ (T_MASK ^ 0x42c50dca)
-#define T63    0x2ad7d2bb
-#define T64 /* 0xeb86d391 */ (T_MASK ^ 0x14792c6e)
-
-
-static void
-md5_process(md5_state_t *pms, const md5_byte_t *data /*[64]*/)
-{
-    md5_word_t
-	a = pms->abcd[0], b = pms->abcd[1],
-	c = pms->abcd[2], d = pms->abcd[3];
-    md5_word_t t;
-#if BYTE_ORDER > 0
-    /* Define storage only for big-endian CPUs. */
-    md5_word_t X[16];
-#else
-    /* Define storage for little-endian or both types of CPUs. */
-    md5_word_t xbuf[16];
-    const md5_word_t *X;
-#endif
-
-    {
-#if BYTE_ORDER == 0
-	/*
-	 * Determine dynamically whether this is a big-endian or
-	 * little-endian machine, since we can use a more efficient
-	 * algorithm on the latter.
-	 */
-	static const int w = 1;
-
-	if (*((const md5_byte_t *)&w)) /* dynamic little-endian */
-#endif
-#if BYTE_ORDER <= 0		/* little-endian */
-	{
-	    /*
-	     * On little-endian machines, we can process properly aligned
-	     * data without copying it.
-	     */
-	    if (!((data - (const md5_byte_t *)0) & 3)) {
-		/* data are properly aligned */
-		X = (const md5_word_t *)data;
-	    } else {
-		/* not aligned */
-		memcpy(xbuf, data, 64);
-		X = xbuf;
-	    }
-	}
-#endif
-#if BYTE_ORDER == 0
-	else			/* dynamic big-endian */
-#endif
-#if BYTE_ORDER >= 0		/* big-endian */
-	{
-	    /*
-	     * On big-endian machines, we must arrange the bytes in the
-	     * right order.
-	     */
-	    const md5_byte_t *xp = data;
-	    int i;
-
-#  if BYTE_ORDER == 0
-	    X = xbuf;		/* (dynamic only) */
-#  else
-#    define xbuf X		/* (static only) */
-#  endif
-	    for (i = 0; i < 16; ++i, xp += 4)
-		xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
-	}
-#endif
-    }
-
-#define ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
-
-    /* Round 1. */
-    /* Let [abcd k s i] denote the operation
-       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
-#define F(x, y, z) (((x) & (y)) | (~(x) & (z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + F(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-    /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  7,  T1);
-    SET(d, a, b, c,  1, 12,  T2);
-    SET(c, d, a, b,  2, 17,  T3);
-    SET(b, c, d, a,  3, 22,  T4);
-    SET(a, b, c, d,  4,  7,  T5);
-    SET(d, a, b, c,  5, 12,  T6);
-    SET(c, d, a, b,  6, 17,  T7);
-    SET(b, c, d, a,  7, 22,  T8);
-    SET(a, b, c, d,  8,  7,  T9);
-    SET(d, a, b, c,  9, 12, T10);
-    SET(c, d, a, b, 10, 17, T11);
-    SET(b, c, d, a, 11, 22, T12);
-    SET(a, b, c, d, 12,  7, T13);
-    SET(d, a, b, c, 13, 12, T14);
-    SET(c, d, a, b, 14, 17, T15);
-    SET(b, c, d, a, 15, 22, T16);
-#undef SET
-
-     /* Round 2. */
-     /* Let [abcd k s i] denote the operation
-          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
-#define G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + G(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  1,  5, T17);
-    SET(d, a, b, c,  6,  9, T18);
-    SET(c, d, a, b, 11, 14, T19);
-    SET(b, c, d, a,  0, 20, T20);
-    SET(a, b, c, d,  5,  5, T21);
-    SET(d, a, b, c, 10,  9, T22);
-    SET(c, d, a, b, 15, 14, T23);
-    SET(b, c, d, a,  4, 20, T24);
-    SET(a, b, c, d,  9,  5, T25);
-    SET(d, a, b, c, 14,  9, T26);
-    SET(c, d, a, b,  3, 14, T27);
-    SET(b, c, d, a,  8, 20, T28);
-    SET(a, b, c, d, 13,  5, T29);
-    SET(d, a, b, c,  2,  9, T30);
-    SET(c, d, a, b,  7, 14, T31);
-    SET(b, c, d, a, 12, 20, T32);
-#undef SET
-
-     /* Round 3. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
-#define H(x, y, z) ((x) ^ (y) ^ (z))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + H(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  5,  4, T33);
-    SET(d, a, b, c,  8, 11, T34);
-    SET(c, d, a, b, 11, 16, T35);
-    SET(b, c, d, a, 14, 23, T36);
-    SET(a, b, c, d,  1,  4, T37);
-    SET(d, a, b, c,  4, 11, T38);
-    SET(c, d, a, b,  7, 16, T39);
-    SET(b, c, d, a, 10, 23, T40);
-    SET(a, b, c, d, 13,  4, T41);
-    SET(d, a, b, c,  0, 11, T42);
-    SET(c, d, a, b,  3, 16, T43);
-    SET(b, c, d, a,  6, 23, T44);
-    SET(a, b, c, d,  9,  4, T45);
-    SET(d, a, b, c, 12, 11, T46);
-    SET(c, d, a, b, 15, 16, T47);
-    SET(b, c, d, a,  2, 23, T48);
-#undef SET
-
-     /* Round 4. */
-     /* Let [abcd k s t] denote the operation
-          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
-#define I(x, y, z) ((y) ^ ((x) | ~(z)))
-#define SET(a, b, c, d, k, s, Ti)\
-  t = a + I(b,c,d) + X[k] + Ti;\
-  a = ROTATE_LEFT(t, s) + b
-     /* Do the following 16 operations. */
-    SET(a, b, c, d,  0,  6, T49);
-    SET(d, a, b, c,  7, 10, T50);
-    SET(c, d, a, b, 14, 15, T51);
-    SET(b, c, d, a,  5, 21, T52);
-    SET(a, b, c, d, 12,  6, T53);
-    SET(d, a, b, c,  3, 10, T54);
-    SET(c, d, a, b, 10, 15, T55);
-    SET(b, c, d, a,  1, 21, T56);
-    SET(a, b, c, d,  8,  6, T57);
-    SET(d, a, b, c, 15, 10, T58);
-    SET(c, d, a, b,  6, 15, T59);
-    SET(b, c, d, a, 13, 21, T60);
-    SET(a, b, c, d,  4,  6, T61);
-    SET(d, a, b, c, 11, 10, T62);
-    SET(c, d, a, b,  2, 15, T63);
-    SET(b, c, d, a,  9, 21, T64);
-#undef SET
-
-     /* Then perform the following additions. (That is increment each
-        of the four registers by the value it had before this block
-        was started.) */
-    pms->abcd[0] += a;
-    pms->abcd[1] += b;
-    pms->abcd[2] += c;
-    pms->abcd[3] += d;
-}
-
-void
-md5_init(md5_state_t *pms)
-{
-    pms->count[0] = pms->count[1] = 0;
-    pms->abcd[0] = 0x67452301;
-    pms->abcd[1] = /*0xefcdab89*/ T_MASK ^ 0x10325476;
-    pms->abcd[2] = /*0x98badcfe*/ T_MASK ^ 0x67452301;
-    pms->abcd[3] = 0x10325476;
-}
-
-void
-md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes)
-{
-    const md5_byte_t *p = data;
-    int left = nbytes;
-    int offset = (pms->count[0] >> 3) & 63;
-    md5_word_t nbits = (md5_word_t)(nbytes << 3);
-
-    if (nbytes <= 0)
-	return;
-
-    /* Update the message length. */
-    pms->count[1] += nbytes >> 29;
-    pms->count[0] += nbits;
-    if (pms->count[0] < nbits)
-	pms->count[1]++;
-
-    /* Process an initial partial block. */
-    if (offset) {
-	int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
-
-	memcpy(pms->buf + offset, p, copy);
-	if (offset + copy < 64)
-	    return;
-	p += copy;
-	left -= copy;
-	md5_process(pms, pms->buf);
-    }
-
-    /* Process full blocks. */
-    for (; left >= 64; p += 64, left -= 64)
-	md5_process(pms, p);
-
-    /* Process a final partial block. */
-    if (left)
-	memcpy(pms->buf, p, left);
-}
-
-void
-md5_finish(md5_state_t *pms, md5_byte_t digest[16])
-{
-    static const md5_byte_t pad[64] = {
-	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-    };
-    md5_byte_t data[8];
-    int i;
-
-    /* Save the length before padding. */
-    for (i = 0; i < 8; ++i)
-	data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
-    /* Pad to 56 bytes mod 64. */
-    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
-    /* Append the length. */
-    md5_append(pms, data, 8);
-    for (i = 0; i < 16; ++i)
-	digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
-}
diff --git a/vendor/udt4/src/md5.h b/vendor/udt4/src/md5.h
deleted file mode 100644
index f7402e7..0000000
--- a/vendor/udt4/src/md5.h
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  L. Peter Deutsch
-  ghost@aladdin.com
-
- */
-/* $Id: md5.h,v 1.2 2007/12/24 05:58:37 lilyco Exp $ */
-/*
-  Independent implementation of MD5 (RFC 1321).
-
-  This code implements the MD5 Algorithm defined in RFC 1321, whose
-  text is available at
-	http://www.ietf.org/rfc/rfc1321.txt
-  The code is derived from the text of the RFC, including the test suite
-  (section A.5) but excluding the rest of Appendix A.  It does not include
-  any code or documentation that is identified in the RFC as being
-  copyrighted.
-
-  The original and principal author of md5.h is L. Peter Deutsch
-  <ghost@aladdin.com>.  Other authors are noted in the change history
-  that follows (in reverse chronological order):
-
-  2002-04-13 lpd Removed support for non-ANSI compilers; removed
-	references to Ghostscript; clarified derivation from RFC 1321;
-	now handles byte order either statically or dynamically.
-  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
-  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
-	added conditionalization for C++ compilation from Martin
-	Purschke <purschke@bnl.gov>.
-  1999-05-03 lpd Original version.
- */
-
-#ifndef md5_INCLUDED
-#  define md5_INCLUDED
-
-/*
- * This package supports both compile-time and run-time determination of CPU
- * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
- * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
- * defined as non-zero, the code will be compiled to run only on big-endian
- * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
- * run on either big- or little-endian CPUs, but will run slightly less
- * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
- */
-
-typedef unsigned char md5_byte_t; /* 8-bit byte */
-typedef unsigned int md5_word_t; /* 32-bit word */
-
-/* Define the state of the MD5 Algorithm. */
-typedef struct md5_state_s {
-    md5_word_t count[2];	/* message length in bits, lsw first */
-    md5_word_t abcd[4];		/* digest buffer */
-    md5_byte_t buf[64];		/* accumulate block */
-} md5_state_t;
-
-#ifdef __cplusplus
-extern "C" 
-{
-#endif
-
-/* Initialize the algorithm. */
-void md5_init(md5_state_t *pms);
-
-/* Append a string to the message. */
-void md5_append(md5_state_t *pms, const md5_byte_t *data, int nbytes);
-
-/* Finish the message and return the digest. */
-void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
-
-#ifdef __cplusplus
-}  /* end extern "C" */
-#endif
-
-#endif /* md5_INCLUDED */
diff --git a/vendor/udt4/src/packet.cpp b/vendor/udt4/src/packet.cpp
deleted file mode 100644
index e238a04..0000000
--- a/vendor/udt4/src/packet.cpp
+++ /dev/null
@@ -1,411 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 02/12/2011
-*****************************************************************************/
-
-
-//////////////////////////////////////////////////////////////////////////////
-//    0                   1                   2                   3
-//    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                        Packet Header                          |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                                                               |
-//   ~              Data / Control Information Field                 ~
-//   |                                                               |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//
-//    0                   1                   2                   3
-//    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |0|                        Sequence Number                      |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |ff |o|                     Message Number                      |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                          Time Stamp                           |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                     Destination Socket ID                     |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//
-//   bit 0:
-//      0: Data Packet
-//      1: Control Packet
-//   bit ff:
-//      11: solo message packet
-//      10: first packet of a message
-//      01: last packet of a message
-//   bit o:
-//      0: in order delivery not required
-//      1: in order delivery required
-//
-//    0                   1                   2                   3
-//    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |1|            Type             |             Reserved          |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                       Additional Info                         |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                          Time Stamp                           |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |                     Destination Socket ID                     |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//
-//   bit 1-15:
-//      0: Protocol Connection Handshake
-//              Add. Info:    Undefined
-//              Control Info: Handshake information (see CHandShake)
-//      1: Keep-alive
-//              Add. Info:    Undefined
-//              Control Info: None
-//      2: Acknowledgement (ACK)
-//              Add. Info:    The ACK sequence number
-//              Control Info: The sequence number to which (but not include) all the previous packets have beed received
-//              Optional:     RTT
-//                            RTT Variance
-//                            available receiver buffer size (in bytes)
-//                            advertised flow window size (number of packets)
-//                            estimated bandwidth (number of packets per second)
-//      3: Negative Acknowledgement (NAK)
-//              Add. Info:    Undefined
-//              Control Info: Loss list (see loss list coding below)
-//      4: Congestion/Delay Warning
-//              Add. Info:    Undefined
-//              Control Info: None
-//      5: Shutdown
-//              Add. Info:    Undefined
-//              Control Info: None
-//      6: Acknowledgement of Acknowledement (ACK-square)
-//              Add. Info:    The ACK sequence number
-//              Control Info: None
-//      7: Message Drop Request
-//              Add. Info:    Message ID
-//              Control Info: first sequence number of the message
-//                            last seqeunce number of the message
-//      8: Error Signal from the Peer Side
-//              Add. Info:    Error code
-//              Control Info: None
-//      0x7FFF: Explained by bits 16 - 31
-//              
-//   bit 16 - 31:
-//      This space is used for future expansion or user defined control packets. 
-//
-//    0                   1                   2                   3
-//    0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |1|                 Sequence Number a (first)                   |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |0|                 Sequence Number b (last)                    |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//   |0|                 Sequence Number (single)                    |
-//   +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-//
-//   Loss List Field Coding:
-//      For any consectutive lost seqeunce numbers that the differnece between
-//      the last and first is more than 1, only record the first (a) and the
-//      the last (b) sequence numbers in the loss list field, and modify the
-//      the first bit of a to 1.
-//      For any single loss or consectutive loss less than 2 packets, use
-//      the original sequence numbers in the field.
-
-
-#include <cstring>
-#include "packet.h"
-
-
-const int CPacket::m_iPktHdrSize = 16;
-const int CHandShake::m_iContentSize = 48;
-
-
-// Set up the aliases in the constructure
-CPacket::CPacket():
-m_iSeqNo((int32_t&)(m_nHeader[0])),
-m_iMsgNo((int32_t&)(m_nHeader[1])),
-m_iTimeStamp((int32_t&)(m_nHeader[2])),
-m_iID((int32_t&)(m_nHeader[3])),
-m_pcData((char*&)(m_PacketVector[1].iov_base)),
-__pad()
-{
-   for (int i = 0; i < 4; ++ i)
-      m_nHeader[i] = 0;
-   m_PacketVector[0].iov_base = (char *)m_nHeader;
-   m_PacketVector[0].iov_len = CPacket::m_iPktHdrSize;
-   m_PacketVector[1].iov_base = NULL;
-   m_PacketVector[1].iov_len = 0;
-}
-
-CPacket::~CPacket()
-{
-}
-
-int CPacket::getLength() const
-{
-   return m_PacketVector[1].iov_len;
-}
-
-void CPacket::setLength(int len)
-{
-   m_PacketVector[1].iov_len = len;
-}
-
-void CPacket::pack(int pkttype, void* lparam, void* rparam, int size)
-{
-   // Set (bit-0 = 1) and (bit-1~15 = type)
-   m_nHeader[0] = 0x80000000 | (pkttype << 16);
-
-   // Set additional information and control information field
-   switch (pkttype)
-   {
-   case 2: //0010 - Acknowledgement (ACK)
-      // ACK packet seq. no.
-      if (NULL != lparam)
-         m_nHeader[1] = *(int32_t *)lparam;
-
-      // data ACK seq. no. 
-      // optional: RTT (microsends), RTT variance (microseconds) advertised flow window size (packets), and estimated link capacity (packets per second)
-      m_PacketVector[1].iov_base = (char *)rparam;
-      m_PacketVector[1].iov_len = size;
-
-      break;
-
-   case 6: //0110 - Acknowledgement of Acknowledgement (ACK-2)
-      // ACK packet seq. no.
-      m_nHeader[1] = *(int32_t *)lparam;
-
-      // control info field should be none
-      // but "writev" does not allow this
-      m_PacketVector[1].iov_base = (char *)&__pad; //NULL;
-      m_PacketVector[1].iov_len = 4; //0;
-
-      break;
-
-   case 3: //0011 - Loss Report (NAK)
-      // loss list
-      m_PacketVector[1].iov_base = (char *)rparam;
-      m_PacketVector[1].iov_len = size;
-
-      break;
-
-   case 4: //0100 - Congestion Warning
-      // control info field should be none
-      // but "writev" does not allow this
-      m_PacketVector[1].iov_base = (char *)&__pad; //NULL;
-      m_PacketVector[1].iov_len = 4; //0;
-  
-      break;
-
-   case 1: //0001 - Keep-alive
-      // control info field should be none
-      // but "writev" does not allow this
-      m_PacketVector[1].iov_base = (char *)&__pad; //NULL;
-      m_PacketVector[1].iov_len = 4; //0;
-
-      break;
-
-   case 0: //0000 - Handshake
-      // control info filed is handshake info
-      m_PacketVector[1].iov_base = (char *)rparam;
-      m_PacketVector[1].iov_len = size; //sizeof(CHandShake);
-
-      break;
-
-   case 5: //0101 - Shutdown
-      // control info field should be none
-      // but "writev" does not allow this
-      m_PacketVector[1].iov_base = (char *)&__pad; //NULL;
-      m_PacketVector[1].iov_len = 4; //0;
-
-      break;
-
-   case 7: //0111 - Message Drop Request
-      // msg id 
-      m_nHeader[1] = *(int32_t *)lparam;
-
-      //first seq no, last seq no
-      m_PacketVector[1].iov_base = (char *)rparam;
-      m_PacketVector[1].iov_len = size;
-
-      break;
-
-   case 8: //1000 - Error Signal from the Peer Side
-      // Error type
-      m_nHeader[1] = *(int32_t *)lparam;
-
-      // control info field should be none
-      // but "writev" does not allow this
-      m_PacketVector[1].iov_base = (char *)&__pad; //NULL;
-      m_PacketVector[1].iov_len = 4; //0;
-
-      break;
-
-   case 32767: //0x7FFF - Reserved for user defined control packets
-      // for extended control packet
-      // "lparam" contains the extended type information for bit 16 - 31
-      // "rparam" is the control information
-      m_nHeader[0] |= *(int32_t *)lparam;
-
-      if (NULL != rparam)
-      {
-         m_PacketVector[1].iov_base = (char *)rparam;
-         m_PacketVector[1].iov_len = size;
-      }
-      else
-      {
-         m_PacketVector[1].iov_base = (char *)&__pad;
-         m_PacketVector[1].iov_len = 4;
-      }
-
-      break;
-
-   default:
-      break;
-   }
-}
-
-iovec* CPacket::getPacketVector()
-{
-   return m_PacketVector;
-}
-
-int CPacket::getFlag() const
-{
-   // read bit 0
-   return m_nHeader[0] >> 31;
-}
-
-int CPacket::getType() const
-{
-   // read bit 1~15
-   return (m_nHeader[0] >> 16) & 0x00007FFF;
-}
-
-int CPacket::getExtendedType() const
-{
-   // read bit 16~31
-   return m_nHeader[0] & 0x0000FFFF;
-}
-
-int32_t CPacket::getAckSeqNo() const
-{
-   // read additional information field
-   return m_nHeader[1];
-}
-
-int CPacket::getMsgBoundary() const
-{
-   // read [1] bit 0~1
-   return m_nHeader[1] >> 30;
-}
-
-bool CPacket::getMsgOrderFlag() const
-{
-   // read [1] bit 2
-   return (1 == ((m_nHeader[1] >> 29) & 1));
-}
-
-int32_t CPacket::getMsgSeq() const
-{
-   // read [1] bit 3~31
-   return m_nHeader[1] & 0x1FFFFFFF;
-}
-
-CPacket* CPacket::clone() const
-{
-   CPacket* pkt = new CPacket;
-   memcpy(pkt->m_nHeader, m_nHeader, m_iPktHdrSize);
-   pkt->m_pcData = new char[m_PacketVector[1].iov_len];
-   memcpy(pkt->m_pcData, m_pcData, m_PacketVector[1].iov_len);
-   pkt->m_PacketVector[1].iov_len = m_PacketVector[1].iov_len;
-
-   return pkt;
-}
-
-CHandShake::CHandShake():
-m_iVersion(0),
-m_iType(0),
-m_iISN(0),
-m_iMSS(0),
-m_iFlightFlagSize(0),
-m_iReqType(0),
-m_iID(0),
-m_iCookie(0)
-{
-   for (int i = 0; i < 4; ++ i)
-      m_piPeerIP[i] = 0;
-}
-
-int CHandShake::serialize(char* buf, int& size)
-{
-   if (size < m_iContentSize)
-      return -1;
-
-   int32_t* p = (int32_t*)buf;
-   *p++ = m_iVersion;
-   *p++ = m_iType;
-   *p++ = m_iISN;
-   *p++ = m_iMSS;
-   *p++ = m_iFlightFlagSize;
-   *p++ = m_iReqType;
-   *p++ = m_iID;
-   *p++ = m_iCookie;
-   for (int i = 0; i < 4; ++ i)
-      *p++ = m_piPeerIP[i];
-
-   size = m_iContentSize;
-
-   return 0;
-}
-
-int CHandShake::deserialize(const char* buf, int size)
-{
-   if (size < m_iContentSize)
-      return -1;
-
-   int32_t* p = (int32_t*)buf;
-   m_iVersion = *p++;
-   m_iType = *p++;
-   m_iISN = *p++;
-   m_iMSS = *p++;
-   m_iFlightFlagSize = *p++;
-   m_iReqType = *p++;
-   m_iID = *p++;
-   m_iCookie = *p++;
-   for (int i = 0; i < 4; ++ i)
-      m_piPeerIP[i] = *p++;
-
-   return 0;
-}
diff --git a/vendor/udt4/src/packet.h b/vendor/udt4/src/packet.h
deleted file mode 100644
index 76cc951..0000000
--- a/vendor/udt4/src/packet.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/02/2011
-*****************************************************************************/
-
-#ifndef __UDT_PACKET_H__
-#define __UDT_PACKET_H__
-
-
-#include "udt.h"
-
-#ifdef WIN32
-   struct iovec
-   {
-      int iov_len;
-      char* iov_base;
-   };
-#endif
-
-class CChannel;
-
-class CPacket
-{
-friend class CChannel;
-friend class CSndQueue;
-friend class CRcvQueue;
-
-public:
-   int32_t& m_iSeqNo;                   // alias: sequence number
-   int32_t& m_iMsgNo;                   // alias: message number
-   int32_t& m_iTimeStamp;               // alias: timestamp
-   int32_t& m_iID;			// alias: socket ID
-   char*& m_pcData;                     // alias: data/control information
-
-   static const int m_iPktHdrSize;	// packet header size
-
-public:
-   CPacket();
-   ~CPacket();
-
-      // Functionality:
-      //    Get the payload or the control information field length.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    the payload or the control information field length.
-
-   int getLength() const;
-
-      // Functionality:
-      //    Set the payload or the control information field length.
-      // Parameters:
-      //    0) [in] len: the payload or the control information field length.
-      // Returned value:
-      //    None.
-
-   void setLength(int len);
-
-      // Functionality:
-      //    Pack a Control packet.
-      // Parameters:
-      //    0) [in] pkttype: packet type filed.
-      //    1) [in] lparam: pointer to the first data structure, explained by the packet type.
-      //    2) [in] rparam: pointer to the second data structure, explained by the packet type.
-      //    3) [in] size: size of rparam, in number of bytes;
-      // Returned value:
-      //    None.
-
-   void pack(int pkttype, void* lparam = NULL, void* rparam = NULL, int size = 0);
-
-      // Functionality:
-      //    Read the packet vector.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Pointer to the packet vector.
-
-   iovec* getPacketVector();
-
-      // Functionality:
-      //    Read the packet flag.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    packet flag (0 or 1).
-
-   int getFlag() const;
-
-      // Functionality:
-      //    Read the packet type.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    packet type filed (000 ~ 111).
-
-   int getType() const;
-
-      // Functionality:
-      //    Read the extended packet type.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    extended packet type filed (0x000 ~ 0xFFF).
-
-   int getExtendedType() const;
-
-      // Functionality:
-      //    Read the ACK-2 seq. no.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    packet header field (bit 16~31).
-
-   int32_t getAckSeqNo() const;
-
-      // Functionality:
-      //    Read the message boundary flag bit.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    packet header field [1] (bit 0~1).
-
-   int getMsgBoundary() const;
-
-      // Functionality:
-      //    Read the message inorder delivery flag bit.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    packet header field [1] (bit 2).
-
-   bool getMsgOrderFlag() const;
-
-      // Functionality:
-      //    Read the message sequence number.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    packet header field [1] (bit 3~31).
-
-   int32_t getMsgSeq() const;
-
-      // Functionality:
-      //    Clone this packet.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Pointer to the new packet.
-
-   CPacket* clone() const;
-
-protected:
-   uint32_t m_nHeader[4];               // The 128-bit header field
-   iovec m_PacketVector[2];             // The 2-demension vector of UDT packet [header, data]
-
-   int32_t __pad;
-
-protected:
-   CPacket& operator=(const CPacket&);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class CHandShake
-{
-public:
-   CHandShake();
-
-   int serialize(char* buf, int& size);
-   int deserialize(const char* buf, int size);
-
-public:
-   static const int m_iContentSize;	// Size of hand shake data
-
-public:
-   int32_t m_iVersion;          // UDT version
-   int32_t m_iType;             // UDT socket type
-   int32_t m_iISN;              // random initial sequence number
-   int32_t m_iMSS;              // maximum segment size
-   int32_t m_iFlightFlagSize;   // flow control window size
-   int32_t m_iReqType;          // connection request type: 1: regular connection request, 0: rendezvous connection request, -1/-2: response
-   int32_t m_iID;		// socket ID
-   int32_t m_iCookie;		// cookie
-   uint32_t m_piPeerIP[4];	// The IP address that the peer's UDP port is bound to
-};
-
-
-#endif
diff --git a/vendor/udt4/src/queue.cpp b/vendor/udt4/src/queue.cpp
deleted file mode 100644
index 2caea2a..0000000
--- a/vendor/udt4/src/queue.cpp
+++ /dev/null
@@ -1,1253 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 05/05/2011
-*****************************************************************************/
-
-#ifdef WIN32
-   #include <winsock2.h>
-   #include <ws2tcpip.h>
-   #ifdef LEGACY_WIN32
-      #include <wspiapi.h>
-   #endif
-#endif
-#include <cstring>
-
-#include "common.h"
-#include "core.h"
-#include "queue.h"
-
-using namespace std;
-
-CUnitQueue::CUnitQueue():
-m_pQEntry(NULL),
-m_pCurrQueue(NULL),
-m_pLastQueue(NULL),
-m_iSize(0),
-m_iCount(0),
-m_iMSS(),
-m_iIPversion()
-{
-}
-
-CUnitQueue::~CUnitQueue()
-{
-   CQEntry* p = m_pQEntry;
-
-   while (p != NULL)
-   {
-      delete [] p->m_pUnit;
-      delete [] p->m_pBuffer;
-
-      CQEntry* q = p;
-      if (p == m_pLastQueue)
-         p = NULL;
-      else
-         p = p->m_pNext;
-      delete q;
-   }
-}
-
-int CUnitQueue::init(int size, int mss, int version)
-{
-   CQEntry* tempq = NULL;
-   CUnit* tempu = NULL;
-   char* tempb = NULL;
-
-   try
-   {
-      tempq = new CQEntry;
-      tempu = new CUnit [size];
-      tempb = new char [size * mss];
-   }
-   catch (...)
-   {
-      delete tempq;
-      delete [] tempu;
-      delete [] tempb;
-
-      return -1;
-   }
-
-   for (int i = 0; i < size; ++ i)
-   {
-      tempu[i].m_iFlag = 0;
-      tempu[i].m_Packet.m_pcData = tempb + i * mss;
-   }
-   tempq->m_pUnit = tempu;
-   tempq->m_pBuffer = tempb;
-   tempq->m_iSize = size;
-
-   m_pQEntry = m_pCurrQueue = m_pLastQueue = tempq;
-   m_pQEntry->m_pNext = m_pQEntry;
-
-   m_pAvailUnit = m_pCurrQueue->m_pUnit;
-
-   m_iSize = size;
-   m_iMSS = mss;
-   m_iIPversion = version;
-
-   return 0;
-}
-
-int CUnitQueue::increase()
-{
-   // adjust/correct m_iCount
-   int real_count = 0;
-   CQEntry* p = m_pQEntry;
-   while (p != NULL)
-   {
-      CUnit* u = p->m_pUnit;
-      for (CUnit* end = u + p->m_iSize; u != end; ++ u)
-         if (u->m_iFlag != 0)
-            ++ real_count;
-
-      if (p == m_pLastQueue)
-         p = NULL;
-      else
-         p = p->m_pNext;
-   }
-   m_iCount = real_count;
-   if (double(m_iCount) / m_iSize < 0.9)
-      return -1;
-
-   CQEntry* tempq = NULL;
-   CUnit* tempu = NULL;
-   char* tempb = NULL;
-
-   // all queues have the same size
-   int size = m_pQEntry->m_iSize;
-
-   try
-   {
-      tempq = new CQEntry;
-      tempu = new CUnit [size];
-      tempb = new char [size * m_iMSS];
-   }
-   catch (...)
-   {
-      delete tempq;
-      delete [] tempu;
-      delete [] tempb;
-
-      return -1;
-   }
-
-   for (int i = 0; i < size; ++ i)
-   {
-      tempu[i].m_iFlag = 0;
-      tempu[i].m_Packet.m_pcData = tempb + i * m_iMSS;
-   }
-   tempq->m_pUnit = tempu;
-   tempq->m_pBuffer = tempb;
-   tempq->m_iSize = size;
-
-   m_pLastQueue->m_pNext = tempq;
-   m_pLastQueue = tempq;
-   m_pLastQueue->m_pNext = m_pQEntry;
-
-   m_iSize += size;
-
-   return 0;
-}
-
-int CUnitQueue::shrink()
-{
-   // currently queue cannot be shrunk.
-   return -1;
-}
-
-CUnit* CUnitQueue::getNextAvailUnit()
-{
-   if (m_iCount * 10 > m_iSize * 9)
-      increase();
-
-   if (m_iCount >= m_iSize)
-      return NULL;
-
-   CQEntry* entrance = m_pCurrQueue;
-
-   do
-   {
-      for (CUnit* sentinel = m_pCurrQueue->m_pUnit + m_pCurrQueue->m_iSize - 1; m_pAvailUnit != sentinel; ++ m_pAvailUnit)
-         if (m_pAvailUnit->m_iFlag == 0)
-            return m_pAvailUnit;
-
-      if (m_pCurrQueue->m_pUnit->m_iFlag == 0)
-      {
-         m_pAvailUnit = m_pCurrQueue->m_pUnit;
-         return m_pAvailUnit;
-      }
-
-      m_pCurrQueue = m_pCurrQueue->m_pNext;
-      m_pAvailUnit = m_pCurrQueue->m_pUnit;
-   } while (m_pCurrQueue != entrance);
-
-   increase();
-
-   return NULL;
-}
-
-
-CSndUList::CSndUList():
-m_pHeap(NULL),
-m_iArrayLength(4096),
-m_iLastEntry(-1),
-m_ListLock(),
-m_pWindowLock(NULL),
-m_pWindowCond(NULL),
-m_pTimer(NULL)
-{
-   m_pHeap = new CSNode*[m_iArrayLength];
-
-   #ifndef WIN32
-      pthread_mutex_init(&m_ListLock, NULL);
-   #else
-      m_ListLock = CreateMutex(NULL, false, NULL);
-   #endif
-}
-
-CSndUList::~CSndUList()
-{
-   delete [] m_pHeap;
-
-   #ifndef WIN32
-      pthread_mutex_destroy(&m_ListLock);
-   #else
-      CloseHandle(m_ListLock);
-   #endif
-}
-
-void CSndUList::insert(int64_t ts, const CUDT* u)
-{
-   CGuard listguard(m_ListLock);
-
-   // increase the heap array size if necessary
-   if (m_iLastEntry == m_iArrayLength - 1)
-   {
-      CSNode** temp = NULL;
-
-      try
-      {
-         temp = new CSNode*[m_iArrayLength * 2];
-      }
-      catch(...)
-      {
-         return;
-      }
-
-      memcpy(temp, m_pHeap, sizeof(CSNode*) * m_iArrayLength);
-      m_iArrayLength *= 2;
-      delete [] m_pHeap;
-      m_pHeap = temp;
-   }
-
-   insert_(ts, u);
-}
-
-void CSndUList::update(const CUDT* u, bool reschedule)
-{
-   CGuard listguard(m_ListLock);
-
-   CSNode* n = u->m_pSNode;
-
-   if (n->m_iHeapLoc >= 0)
-   {
-      if (!reschedule)
-         return;
-
-      if (n->m_iHeapLoc == 0)
-      {
-         n->m_llTimeStamp = 1;
-         m_pTimer->interrupt();
-         return;
-      }
-
-      remove_(u);
-   }
-
-   insert_(1, u);
-}
-
-int CSndUList::pop(sockaddr*& addr, CPacket& pkt)
-{
-   CGuard listguard(m_ListLock);
-
-   if (-1 == m_iLastEntry)
-      return -1;
-
-   // no pop until the next schedulled time
-   uint64_t ts;
-   CTimer::rdtsc(ts);
-   if (ts < m_pHeap[0]->m_llTimeStamp)
-      return -1;
-
-   CUDT* u = m_pHeap[0]->m_pUDT;
-   remove_(u);
-
-   if (!u->m_bConnected || u->m_bBroken)
-      return -1;
-
-   // pack a packet from the socket
-   if (u->packData(pkt, ts) <= 0)
-      return -1;
-
-   addr = u->m_pPeerAddr;
-
-   // insert a new entry, ts is the next processing time
-   if (ts > 0)
-      insert_(ts, u);
-
-   return 1;
-}
-
-void CSndUList::remove(const CUDT* u)
-{
-   CGuard listguard(m_ListLock);
-
-   remove_(u);
-}
-
-uint64_t CSndUList::getNextProcTime()
-{
-   CGuard listguard(m_ListLock);
-
-   if (-1 == m_iLastEntry)
-      return 0;
-
-   return m_pHeap[0]->m_llTimeStamp;
-}
-
-void CSndUList::insert_(int64_t ts, const CUDT* u)
-{
-   CSNode* n = u->m_pSNode;
-
-   // do not insert repeated node
-   if (n->m_iHeapLoc >= 0)
-      return;
-
-   m_iLastEntry ++;
-   m_pHeap[m_iLastEntry] = n;
-   n->m_llTimeStamp = ts;
-
-   int q = m_iLastEntry;
-   int p = q;
-   while (p != 0)
-   {
-      p = (q - 1) >> 1;
-      if (m_pHeap[p]->m_llTimeStamp > m_pHeap[q]->m_llTimeStamp)
-      {
-         CSNode* t = m_pHeap[p];
-         m_pHeap[p] = m_pHeap[q];
-         m_pHeap[q] = t;
-         t->m_iHeapLoc = q;
-         q = p;
-      }
-      else
-         break;
-   }
-
-   n->m_iHeapLoc = q;
-
-   // an earlier event has been inserted, wake up sending worker
-   if (n->m_iHeapLoc == 0)
-      m_pTimer->interrupt();
-
-   // first entry, activate the sending queue
-   if (0 == m_iLastEntry)
-   {
-      #ifndef WIN32
-         pthread_mutex_lock(m_pWindowLock);
-         pthread_cond_signal(m_pWindowCond);
-         pthread_mutex_unlock(m_pWindowLock);
-      #else
-         SetEvent(*m_pWindowCond);
-      #endif
-   }
-}
-
-void CSndUList::remove_(const CUDT* u)
-{
-   CSNode* n = u->m_pSNode;
-
-   if (n->m_iHeapLoc >= 0)
-   {
-      // remove the node from heap
-      m_pHeap[n->m_iHeapLoc] = m_pHeap[m_iLastEntry];
-      m_iLastEntry --;
-      m_pHeap[n->m_iHeapLoc]->m_iHeapLoc = n->m_iHeapLoc;
-
-      int q = n->m_iHeapLoc;
-      int p = q * 2 + 1;
-      while (p <= m_iLastEntry)
-      {
-         if ((p + 1 <= m_iLastEntry) && (m_pHeap[p]->m_llTimeStamp > m_pHeap[p + 1]->m_llTimeStamp))
-            p ++;
-
-         if (m_pHeap[q]->m_llTimeStamp > m_pHeap[p]->m_llTimeStamp)
-         {
-            CSNode* t = m_pHeap[p];
-            m_pHeap[p] = m_pHeap[q];
-            m_pHeap[p]->m_iHeapLoc = p;
-            m_pHeap[q] = t;
-            m_pHeap[q]->m_iHeapLoc = q;
-
-            q = p;
-            p = q * 2 + 1;
-         }
-         else
-            break;
-      }
-
-      n->m_iHeapLoc = -1;
-   }
-
-   // the only event has been deleted, wake up immediately
-   if (0 == m_iLastEntry)
-      m_pTimer->interrupt();
-}
-
-//
-CSndQueue::CSndQueue():
-m_WorkerThread(),
-m_pSndUList(NULL),
-m_pChannel(NULL),
-m_pTimer(NULL),
-m_WindowLock(),
-m_WindowCond(),
-m_bClosing(false),
-m_ExitCond()
-{
-   #ifndef WIN32
-      pthread_cond_init(&m_WindowCond, NULL);
-      pthread_mutex_init(&m_WindowLock, NULL);
-   #else
-      m_WindowLock = CreateMutex(NULL, false, NULL);
-      m_WindowCond = CreateEvent(NULL, false, false, NULL);
-      m_ExitCond = CreateEvent(NULL, false, false, NULL);
-   #endif
-}
-
-CSndQueue::~CSndQueue()
-{
-   m_bClosing = true;
-
-   #ifndef WIN32
-      pthread_mutex_lock(&m_WindowLock);
-      pthread_cond_signal(&m_WindowCond);
-      pthread_mutex_unlock(&m_WindowLock);
-      if (0 != m_WorkerThread)
-         pthread_join(m_WorkerThread, NULL);
-      pthread_cond_destroy(&m_WindowCond);
-      pthread_mutex_destroy(&m_WindowLock);
-   #else
-      SetEvent(m_WindowCond);
-      if (NULL != m_WorkerThread)
-         WaitForSingleObject(m_ExitCond, INFINITE);
-      CloseHandle(m_WorkerThread);
-      CloseHandle(m_WindowLock);
-      CloseHandle(m_WindowCond);
-      CloseHandle(m_ExitCond);
-   #endif
-
-   delete m_pSndUList;
-}
-
-void CSndQueue::init(CChannel* c, CTimer* t)
-{
-   m_pChannel = c;
-   m_pTimer = t;
-   m_pSndUList = new CSndUList;
-   m_pSndUList->m_pWindowLock = &m_WindowLock;
-   m_pSndUList->m_pWindowCond = &m_WindowCond;
-   m_pSndUList->m_pTimer = m_pTimer;
-
-   #ifndef WIN32
-      if (0 != pthread_create(&m_WorkerThread, NULL, CSndQueue::worker, this))
-      {
-         m_WorkerThread = 0;
-         throw CUDTException(3, 1);
-      }
-   #else
-      DWORD threadID;
-      m_WorkerThread = CreateThread(NULL, 0, CSndQueue::worker, this, 0, &threadID);
-      if (NULL == m_WorkerThread)
-         throw CUDTException(3, 1);
-   #endif
-}
-
-#ifndef WIN32
-   void* CSndQueue::worker(void* param)
-#else
-   DWORD WINAPI CSndQueue::worker(LPVOID param)
-#endif
-{
-   CSndQueue* self = (CSndQueue*)param;
-
-   while (!self->m_bClosing)
-   {
-      uint64_t ts = self->m_pSndUList->getNextProcTime();
-
-      if (ts > 0)
-      {
-         // wait until next processing time of the first socket on the list
-         uint64_t currtime;
-         CTimer::rdtsc(currtime);
-         if (currtime < ts)
-            self->m_pTimer->sleepto(ts);
-
-         // it is time to send the next pkt
-         sockaddr* addr;
-         CPacket pkt;
-         if (self->m_pSndUList->pop(addr, pkt) < 0)
-            continue;
-
-         self->m_pChannel->sendto(addr, pkt);
-      }
-      else
-      {
-         // wait here if there is no sockets with data to be sent
-         #ifndef WIN32
-            pthread_mutex_lock(&self->m_WindowLock);
-            if (!self->m_bClosing && (self->m_pSndUList->m_iLastEntry < 0))
-               pthread_cond_wait(&self->m_WindowCond, &self->m_WindowLock);
-            pthread_mutex_unlock(&self->m_WindowLock);
-         #else
-            WaitForSingleObject(self->m_WindowCond, INFINITE);
-         #endif
-      }
-   }
-
-   #ifndef WIN32
-      return NULL;
-   #else
-      SetEvent(self->m_ExitCond);
-      return 0;
-   #endif
-}
-
-int CSndQueue::sendto(const sockaddr* addr, CPacket& packet)
-{
-   // send out the packet immediately (high priority), this is a control packet
-   m_pChannel->sendto(addr, packet);
-   return packet.getLength();
-}
-
-
-//
-CRcvUList::CRcvUList():
-m_pUList(NULL),
-m_pLast(NULL)
-{
-}
-
-CRcvUList::~CRcvUList()
-{
-}
-
-void CRcvUList::insert(const CUDT* u)
-{
-   CRNode* n = u->m_pRNode;
-   CTimer::rdtsc(n->m_llTimeStamp);
-
-   if (NULL == m_pUList)
-   {
-      // empty list, insert as the single node
-      n->m_pPrev = n->m_pNext = NULL;
-      m_pLast = m_pUList = n;
-
-      return;
-   }
-
-   // always insert at the end for RcvUList
-   n->m_pPrev = m_pLast;
-   n->m_pNext = NULL;
-   m_pLast->m_pNext = n;
-   m_pLast = n;
-}
-
-void CRcvUList::remove(const CUDT* u)
-{
-   CRNode* n = u->m_pRNode;
-
-   if (!n->m_bOnList)
-      return;
-
-   if (NULL == n->m_pPrev)
-   {
-      // n is the first node
-      m_pUList = n->m_pNext;
-      if (NULL == m_pUList)
-         m_pLast = NULL;
-      else
-         m_pUList->m_pPrev = NULL;
-   }
-   else
-   {
-      n->m_pPrev->m_pNext = n->m_pNext;
-      if (NULL == n->m_pNext)
-      {
-         // n is the last node
-         m_pLast = n->m_pPrev;
-      }
-      else
-         n->m_pNext->m_pPrev = n->m_pPrev;
-   }
-
-   n->m_pNext = n->m_pPrev = NULL;
-}
-
-void CRcvUList::update(const CUDT* u)
-{
-   CRNode* n = u->m_pRNode;
-
-   if (!n->m_bOnList)
-      return;
-
-   CTimer::rdtsc(n->m_llTimeStamp);
-
-   // if n is the last node, do not need to change
-   if (NULL == n->m_pNext)
-      return;
-
-   if (NULL == n->m_pPrev)
-   {
-      m_pUList = n->m_pNext;
-      m_pUList->m_pPrev = NULL;
-   }
-   else
-   {
-      n->m_pPrev->m_pNext = n->m_pNext;
-      n->m_pNext->m_pPrev = n->m_pPrev;
-   }
-
-   n->m_pPrev = m_pLast;
-   n->m_pNext = NULL;
-   m_pLast->m_pNext = n;
-   m_pLast = n;
-}
-
-//
-CHash::CHash():
-m_pBucket(NULL),
-m_iHashSize(0)
-{
-}
-
-CHash::~CHash()
-{
-   for (int i = 0; i < m_iHashSize; ++ i)
-   {
-      CBucket* b = m_pBucket[i];
-      while (NULL != b)
-      {
-         CBucket* n = b->m_pNext;
-         delete b;
-         b = n;
-      }
-   }
-
-   delete [] m_pBucket;
-}
-
-void CHash::init(int size)
-{
-   m_pBucket = new CBucket* [size];
-
-   for (int i = 0; i < size; ++ i)
-      m_pBucket[i] = NULL;
-
-   m_iHashSize = size;
-}
-
-CUDT* CHash::lookup(int32_t id)
-{
-   // simple hash function (% hash table size); suitable for socket descriptors
-   CBucket* b = m_pBucket[id % m_iHashSize];
-
-   while (NULL != b)
-   {
-      if (id == b->m_iID)
-         return b->m_pUDT;
-      b = b->m_pNext;
-   }
-
-   return NULL;
-}
-
-void CHash::insert(int32_t id, CUDT* u)
-{
-   CBucket* b = m_pBucket[id % m_iHashSize];
-
-   CBucket* n = new CBucket;
-   n->m_iID = id;
-   n->m_pUDT = u;
-   n->m_pNext = b;
-
-   m_pBucket[id % m_iHashSize] = n;
-}
-
-void CHash::remove(int32_t id)
-{
-   CBucket* b = m_pBucket[id % m_iHashSize];
-   CBucket* p = NULL;
-
-   while (NULL != b)
-   {
-      if (id == b->m_iID)
-      {
-         if (NULL == p)
-            m_pBucket[id % m_iHashSize] = b->m_pNext;
-         else
-            p->m_pNext = b->m_pNext;
-
-         delete b;
-
-         return;
-      }
-
-      p = b;
-      b = b->m_pNext;
-   }
-}
-
-
-//
-CRendezvousQueue::CRendezvousQueue():
-m_lRendezvousID(),
-m_RIDVectorLock()
-{
-   #ifndef WIN32
-      pthread_mutex_init(&m_RIDVectorLock, NULL);
-   #else
-      m_RIDVectorLock = CreateMutex(NULL, false, NULL);
-   #endif
-}
-
-CRendezvousQueue::~CRendezvousQueue()
-{
-   #ifndef WIN32
-      pthread_mutex_destroy(&m_RIDVectorLock);
-   #else
-      CloseHandle(m_RIDVectorLock);
-   #endif
-
-   for (list<CRL>::iterator i = m_lRendezvousID.begin(); i != m_lRendezvousID.end(); ++ i)
-   {
-      if (AF_INET == i->m_iIPversion)
-         delete (sockaddr_in*)i->m_pPeerAddr;
-      else
-         delete (sockaddr_in6*)i->m_pPeerAddr;
-   }
-
-   m_lRendezvousID.clear();
-}
-
-void CRendezvousQueue::insert(const UDTSOCKET& id, CUDT* u, int ipv, const sockaddr* addr, uint64_t ttl)
-{
-   CGuard vg(m_RIDVectorLock);
-
-   CRL r;
-   r.m_iID = id;
-   r.m_pUDT = u;
-   r.m_iIPversion = ipv;
-   r.m_pPeerAddr = (AF_INET == ipv) ? (sockaddr*)new sockaddr_in : (sockaddr*)new sockaddr_in6;
-   memcpy(r.m_pPeerAddr, addr, (AF_INET == ipv) ? sizeof(sockaddr_in) : sizeof(sockaddr_in6));
-   r.m_ullTTL = ttl;
-
-   m_lRendezvousID.push_back(r);
-}
-
-void CRendezvousQueue::remove(const UDTSOCKET& id)
-{
-   CGuard vg(m_RIDVectorLock);
-
-   for (list<CRL>::iterator i = m_lRendezvousID.begin(); i != m_lRendezvousID.end(); ++ i)
-   {
-      if (i->m_iID == id)
-      {
-         if (AF_INET == i->m_iIPversion)
-            delete (sockaddr_in*)i->m_pPeerAddr;
-         else
-            delete (sockaddr_in6*)i->m_pPeerAddr;
-
-         m_lRendezvousID.erase(i);
-
-         return;
-      }
-   }
-}
-
-CUDT* CRendezvousQueue::retrieve(const sockaddr* addr, UDTSOCKET& id)
-{
-   CGuard vg(m_RIDVectorLock);
-
-   // TODO: optimize search
-   for (list<CRL>::iterator i = m_lRendezvousID.begin(); i != m_lRendezvousID.end(); ++ i)
-   {
-      if (CIPAddress::ipcmp(addr, i->m_pPeerAddr, i->m_iIPversion) && ((0 == id) || (id == i->m_iID)))
-      {
-         id = i->m_iID;
-         return i->m_pUDT;
-      }
-   }
-
-   return NULL;
-}
-
-void CRendezvousQueue::updateConnStatus()
-{
-   if (m_lRendezvousID.empty())
-      return;
-
-   CGuard vg(m_RIDVectorLock);
-
-   for (list<CRL>::iterator i = m_lRendezvousID.begin(); i != m_lRendezvousID.end(); ++ i)
-   {
-      // avoid sending too many requests, at most 1 request per 250ms
-      if (CTimer::getTime() - i->m_pUDT->m_llLastReqTime > 250000)
-      {
-         if (CTimer::getTime() >= i->m_ullTTL)
-         {
-            // connection timer expired, acknowledge app via epoll
-            i->m_pUDT->m_bConnecting = false;
-            CUDT::s_UDTUnited.m_EPoll.update_events(i->m_iID, i->m_pUDT->m_sPollID, UDT_EPOLL_ERR, true);
-            continue;
-         }
-
-         CPacket request;
-         char* reqdata = new char [i->m_pUDT->m_iPayloadSize];
-         request.pack(0, NULL, reqdata, i->m_pUDT->m_iPayloadSize);
-         // ID = 0, connection request
-         request.m_iID = !i->m_pUDT->m_bRendezvous ? 0 : i->m_pUDT->m_ConnRes.m_iID;
-         int hs_size = i->m_pUDT->m_iPayloadSize;
-         i->m_pUDT->m_ConnReq.serialize(reqdata, hs_size);
-         request.setLength(hs_size);
-         i->m_pUDT->m_pSndQueue->sendto(i->m_pPeerAddr, request);
-         i->m_pUDT->m_llLastReqTime = CTimer::getTime();
-         delete [] reqdata;
-      }
-   }
-}
-
-//
-CRcvQueue::CRcvQueue():
-m_WorkerThread(),
-m_UnitQueue(),
-m_pRcvUList(NULL),
-m_pHash(NULL),
-m_pChannel(NULL),
-m_pTimer(NULL),
-m_iPayloadSize(),
-m_bClosing(false),
-m_ExitCond(),
-m_LSLock(),
-m_pListener(NULL),
-m_pRendezvousQueue(NULL),
-m_vNewEntry(),
-m_IDLock(),
-m_mBuffer(),
-m_PassLock(),
-m_PassCond()
-{
-   #ifndef WIN32
-      pthread_mutex_init(&m_PassLock, NULL);
-      pthread_cond_init(&m_PassCond, NULL);
-      pthread_mutex_init(&m_LSLock, NULL);
-      pthread_mutex_init(&m_IDLock, NULL);
-   #else
-      m_PassLock = CreateMutex(NULL, false, NULL);
-      m_PassCond = CreateEvent(NULL, false, false, NULL);
-      m_LSLock = CreateMutex(NULL, false, NULL);
-      m_IDLock = CreateMutex(NULL, false, NULL);
-      m_ExitCond = CreateEvent(NULL, false, false, NULL);
-   #endif
-}
-
-CRcvQueue::~CRcvQueue()
-{
-   m_bClosing = true;
-
-   #ifndef WIN32
-      if (0 != m_WorkerThread)
-         pthread_join(m_WorkerThread, NULL);
-      pthread_mutex_destroy(&m_PassLock);
-      pthread_cond_destroy(&m_PassCond);
-      pthread_mutex_destroy(&m_LSLock);
-      pthread_mutex_destroy(&m_IDLock);
-   #else
-      if (NULL != m_WorkerThread)
-         WaitForSingleObject(m_ExitCond, INFINITE);
-      CloseHandle(m_WorkerThread);
-      CloseHandle(m_PassLock);
-      CloseHandle(m_PassCond);
-      CloseHandle(m_LSLock);
-      CloseHandle(m_IDLock);
-      CloseHandle(m_ExitCond);
-   #endif
-
-   delete m_pRcvUList;
-   delete m_pHash;
-   delete m_pRendezvousQueue;
-
-   // remove all queued messages
-   for (map<int32_t, std::queue<CPacket*> >::iterator i = m_mBuffer.begin(); i != m_mBuffer.end(); ++ i)
-   {
-      while (!i->second.empty())
-      {
-         CPacket* pkt = i->second.front();
-         delete [] pkt->m_pcData;
-         delete pkt;
-         i->second.pop();
-      }
-   }
-}
-
-void CRcvQueue::init(int qsize, int payload, int version, int hsize, CChannel* cc, CTimer* t)
-{
-   m_iPayloadSize = payload;
-
-   m_UnitQueue.init(qsize, payload, version);
-
-   m_pHash = new CHash;
-   m_pHash->init(hsize);
-
-   m_pChannel = cc;
-   m_pTimer = t;
-
-   m_pRcvUList = new CRcvUList;
-   m_pRendezvousQueue = new CRendezvousQueue;
-
-   #ifndef WIN32
-      if (0 != pthread_create(&m_WorkerThread, NULL, CRcvQueue::worker, this))
-      {
-         m_WorkerThread = 0;
-         throw CUDTException(3, 1);
-      }
-   #else
-      DWORD threadID;
-      m_WorkerThread = CreateThread(NULL, 0, CRcvQueue::worker, this, 0, &threadID);
-      if (NULL == m_WorkerThread)
-         throw CUDTException(3, 1);
-   #endif
-}
-
-#ifndef WIN32
-   void* CRcvQueue::worker(void* param)
-#else
-   DWORD WINAPI CRcvQueue::worker(LPVOID param)
-#endif
-{
-   CRcvQueue* self = (CRcvQueue*)param;
-
-   sockaddr* addr = (AF_INET == self->m_UnitQueue.m_iIPversion) ? (sockaddr*) new sockaddr_in : (sockaddr*) new sockaddr_in6;
-   CUDT* u = NULL;
-   int32_t id;
-
-   while (!self->m_bClosing)
-   {
-      #ifdef NO_BUSY_WAITING
-         self->m_pTimer->tick();
-      #endif
-
-      // check waiting list, if new socket, insert it to the list
-      while (self->ifNewEntry())
-      {
-         CUDT* ne = self->getNewEntry();
-         if (NULL != ne)
-         {
-            self->m_pRcvUList->insert(ne);
-            self->m_pHash->insert(ne->m_SocketID, ne);
-         }
-      }
-
-      // find next available slot for incoming packet
-      CUnit* unit = self->m_UnitQueue.getNextAvailUnit();
-      if (NULL == unit)
-      {
-         // no space, skip this packet
-         CPacket temp;
-         temp.m_pcData = new char[self->m_iPayloadSize];
-         temp.setLength(self->m_iPayloadSize);
-         self->m_pChannel->recvfrom(addr, temp);
-         delete [] temp.m_pcData;
-         goto TIMER_CHECK;
-      }
-
-      unit->m_Packet.setLength(self->m_iPayloadSize);
-
-      // reading next incoming packet, recvfrom returns -1 is nothing has been received
-      if (self->m_pChannel->recvfrom(addr, unit->m_Packet) < 0)
-         goto TIMER_CHECK;
-
-      id = unit->m_Packet.m_iID;
-
-      // ID 0 is for connection request, which should be passed to the listening socket or rendezvous sockets
-      if (0 == id)
-      {
-         if (NULL != self->m_pListener)
-            self->m_pListener->listen(addr, unit->m_Packet);
-         else if (NULL != (u = self->m_pRendezvousQueue->retrieve(addr, id)))
-         {
-            // asynchronous connect: call connect here
-            // otherwise wait for the UDT socket to retrieve this packet
-            if (!u->m_bSynRecving)
-               u->connect(unit->m_Packet);
-            else
-               self->storePkt(id, unit->m_Packet.clone());
-         }
-      }
-      else if (id > 0)
-      {
-         if (NULL != (u = self->m_pHash->lookup(id)))
-         {
-            if (CIPAddress::ipcmp(addr, u->m_pPeerAddr, u->m_iIPversion))
-            {
-               if (u->m_bConnected && !u->m_bBroken && !u->m_bClosing)
-               {
-                  if (0 == unit->m_Packet.getFlag())
-                     u->processData(unit);
-                  else
-                     u->processCtrl(unit->m_Packet);
-
-                  u->checkTimers();
-                  self->m_pRcvUList->update(u);
-               }
-            }
-         }
-         else if (NULL != (u = self->m_pRendezvousQueue->retrieve(addr, id)))
-         {
-            if (!u->m_bSynRecving)
-               u->connect(unit->m_Packet);
-            else
-               self->storePkt(id, unit->m_Packet.clone());
-         }
-      }
-
-TIMER_CHECK:
-      // take care of the timing event for all UDT sockets
-
-      uint64_t currtime;
-      CTimer::rdtsc(currtime);
-
-      CRNode* ul = self->m_pRcvUList->m_pUList;
-      uint64_t ctime = currtime - 100000 * CTimer::getCPUFrequency();
-      while ((NULL != ul) && (ul->m_llTimeStamp < ctime))
-      {
-         CUDT* u = ul->m_pUDT;
-
-         if (u->m_bConnected && !u->m_bBroken && !u->m_bClosing)
-         {
-            u->checkTimers();
-            self->m_pRcvUList->update(u);
-         }
-         else
-         {
-            // the socket must be removed from Hash table first, then RcvUList
-            self->m_pHash->remove(u->m_SocketID);
-            self->m_pRcvUList->remove(u);
-            u->m_pRNode->m_bOnList = false;
-         }
-
-         ul = self->m_pRcvUList->m_pUList;
-      }
-
-      // Check connection requests status for all sockets in the RendezvousQueue.
-      self->m_pRendezvousQueue->updateConnStatus();
-   }
-
-   if (AF_INET == self->m_UnitQueue.m_iIPversion)
-      delete (sockaddr_in*)addr;
-   else
-      delete (sockaddr_in6*)addr;
-
-   #ifndef WIN32
-      return NULL;
-   #else
-      SetEvent(self->m_ExitCond);
-      return 0;
-   #endif
-}
-
-int CRcvQueue::recvfrom(int32_t id, CPacket& packet)
-{
-   CGuard bufferlock(m_PassLock);
-
-   map<int32_t, std::queue<CPacket*> >::iterator i = m_mBuffer.find(id);
-
-   if (i == m_mBuffer.end())
-   {
-      #ifndef WIN32
-         uint64_t now = CTimer::getTime();
-         timespec timeout;
-
-         timeout.tv_sec = now / 1000000 + 1;
-         timeout.tv_nsec = (now % 1000000) * 1000;
-
-         pthread_cond_timedwait(&m_PassCond, &m_PassLock, &timeout);
-      #else
-         ReleaseMutex(m_PassLock);
-         WaitForSingleObject(m_PassCond, 1000);
-         WaitForSingleObject(m_PassLock, INFINITE);
-      #endif
-
-      i = m_mBuffer.find(id);
-      if (i == m_mBuffer.end())
-      {
-         packet.setLength(-1);
-         return -1;
-      }
-   }
-
-   // retrieve the earliest packet
-   CPacket* newpkt = i->second.front();
-
-   if (packet.getLength() < newpkt->getLength())
-   {
-      packet.setLength(-1);
-      return -1;
-   }
-
-   // copy packet content
-   memcpy(packet.m_nHeader, newpkt->m_nHeader, CPacket::m_iPktHdrSize);
-   memcpy(packet.m_pcData, newpkt->m_pcData, newpkt->getLength());
-   packet.setLength(newpkt->getLength());
-
-   delete [] newpkt->m_pcData;
-   delete newpkt;
-
-   // remove this message from queue, 
-   // if no more messages left for this socket, release its data structure
-   i->second.pop();
-   if (i->second.empty())
-      m_mBuffer.erase(i);
-
-   return packet.getLength();
-}
-
-int CRcvQueue::setListener(CUDT* u)
-{
-   CGuard lslock(m_LSLock);
-
-   if (NULL != m_pListener)
-      return -1;
-
-   m_pListener = u;
-   return 0;
-}
-
-void CRcvQueue::removeListener(const CUDT* u)
-{
-   CGuard lslock(m_LSLock);
-
-   if (u == m_pListener)
-      m_pListener = NULL;
-}
-
-void CRcvQueue::registerConnector(const UDTSOCKET& id, CUDT* u, int ipv, const sockaddr* addr, uint64_t ttl)
-{
-   m_pRendezvousQueue->insert(id, u, ipv, addr, ttl);
-}
-
-void CRcvQueue::removeConnector(const UDTSOCKET& id)
-{
-   m_pRendezvousQueue->remove(id);
-
-   CGuard bufferlock(m_PassLock);
-
-   map<int32_t, std::queue<CPacket*> >::iterator i = m_mBuffer.find(id);
-   if (i != m_mBuffer.end())
-   {
-      while (!i->second.empty())
-      {
-         delete [] i->second.front()->m_pcData;
-         delete i->second.front();
-         i->second.pop();
-      }
-      m_mBuffer.erase(i);
-   }
-}
-
-void CRcvQueue::setNewEntry(CUDT* u)
-{
-   CGuard listguard(m_IDLock);
-   m_vNewEntry.push_back(u);
-}
-
-bool CRcvQueue::ifNewEntry()
-{
-   return !(m_vNewEntry.empty());
-}
-
-CUDT* CRcvQueue::getNewEntry()
-{
-   CGuard listguard(m_IDLock);
-
-   if (m_vNewEntry.empty())
-      return NULL;
-
-   CUDT* u = (CUDT*)*(m_vNewEntry.begin());
-   m_vNewEntry.erase(m_vNewEntry.begin());
-
-   return u;
-}
-
-void CRcvQueue::storePkt(int32_t id, CPacket* pkt)
-{
-   CGuard bufferlock(m_PassLock);   
-
-   map<int32_t, std::queue<CPacket*> >::iterator i = m_mBuffer.find(id);
-
-   if (i == m_mBuffer.end())
-   {
-      m_mBuffer[id].push(pkt);
-
-      #ifndef WIN32
-         pthread_cond_signal(&m_PassCond);
-      #else
-         SetEvent(m_PassCond);
-      #endif
-   }
-   else
-   {
-      //avoid storing too many packets, in case of malfunction or attack
-      if (i->second.size() > 16)
-         return;
-
-      i->second.push(pkt);
-   }
-}
diff --git a/vendor/udt4/src/queue.h b/vendor/udt4/src/queue.h
deleted file mode 100644
index 9feff18..0000000
--- a/vendor/udt4/src/queue.h
+++ /dev/null
@@ -1,527 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/12/2011
-*****************************************************************************/
-
-
-#ifndef __UDT_QUEUE_H__
-#define __UDT_QUEUE_H__
-
-#include "channel.h"
-#include "common.h"
-#include "packet.h"
-#include <list>
-#include <map>
-#include <queue>
-#include <vector>
-
-class CUDT;
-
-struct CUnit
-{
-   CPacket m_Packet;		// packet
-   int m_iFlag;			// 0: free, 1: occupied, 2: msg read but not freed (out-of-order), 3: msg dropped
-};
-
-class CUnitQueue
-{
-friend class CRcvQueue;
-friend class CRcvBuffer;
-
-public:
-   CUnitQueue();
-   ~CUnitQueue();
-
-public:
-
-      // Functionality:
-      //    Initialize the unit queue.
-      // Parameters:
-      //    1) [in] size: queue size
-      //    2) [in] mss: maximum segament size
-      //    3) [in] version: IP version
-      // Returned value:
-      //    0: success, -1: failure.
-
-   int init(int size, int mss, int version);
-
-      // Functionality:
-      //    Increase (double) the unit queue size.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    0: success, -1: failure.
-
-   int increase();
-
-      // Functionality:
-      //    Decrease (halve) the unit queue size.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    0: success, -1: failure.
-
-   int shrink();
-
-      // Functionality:
-      //    find an available unit for incoming packet.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Pointer to the available unit, NULL if not found.
-
-   CUnit* getNextAvailUnit();
-
-private:
-   struct CQEntry
-   {
-      CUnit* m_pUnit;		// unit queue
-      char* m_pBuffer;		// data buffer
-      int m_iSize;		// size of each queue
-
-      CQEntry* m_pNext;
-   }
-   *m_pQEntry,			// pointer to the first unit queue
-   *m_pCurrQueue,		// pointer to the current available queue
-   *m_pLastQueue;		// pointer to the last unit queue
-
-   CUnit* m_pAvailUnit;         // recent available unit
-
-   int m_iSize;			// total size of the unit queue, in number of packets
-   int m_iCount;		// total number of valid packets in the queue
-
-   int m_iMSS;			// unit buffer size
-   int m_iIPversion;		// IP version
-
-private:
-   CUnitQueue(const CUnitQueue&);
-   CUnitQueue& operator=(const CUnitQueue&);
-};
-
-struct CSNode
-{
-   CUDT* m_pUDT;		// Pointer to the instance of CUDT socket
-   uint64_t m_llTimeStamp;      // Time Stamp
-
-   int m_iHeapLoc;		// location on the heap, -1 means not on the heap
-};
-
-class CSndUList
-{
-friend class CSndQueue;
-
-public:
-   CSndUList();
-   ~CSndUList();
-
-public:
-
-      // Functionality:
-      //    Insert a new UDT instance into the list.
-      // Parameters:
-      //    1) [in] ts: time stamp: next processing time
-      //    2) [in] u: pointer to the UDT instance
-      // Returned value:
-      //    None.
-
-   void insert(int64_t ts, const CUDT* u);
-
-      // Functionality:
-      //    Update the timestamp of the UDT instance on the list.
-      // Parameters:
-      //    1) [in] u: pointer to the UDT instance
-      //    2) [in] resechedule: if the timestampe shoudl be rescheduled
-      // Returned value:
-      //    None.
-
-   void update(const CUDT* u, bool reschedule = true);
-
-      // Functionality:
-      //    Retrieve the next packet and peer address from the first entry, and reschedule it in the queue.
-      // Parameters:
-      //    0) [out] addr: destination address of the next packet
-      //    1) [out] pkt: the next packet to be sent
-      // Returned value:
-      //    1 if successfully retrieved, -1 if no packet found.
-
-   int pop(sockaddr*& addr, CPacket& pkt);
-
-      // Functionality:
-      //    Remove UDT instance from the list.
-      // Parameters:
-      //    1) [in] u: pointer to the UDT instance
-      // Returned value:
-      //    None.
-
-   void remove(const CUDT* u);
-
-      // Functionality:
-      //    Retrieve the next scheduled processing time.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Scheduled processing time of the first UDT socket in the list.
-
-   uint64_t getNextProcTime();
-
-private:
-   void insert_(int64_t ts, const CUDT* u);
-   void remove_(const CUDT* u);
-
-private:
-   CSNode** m_pHeap;			// The heap array
-   int m_iArrayLength;			// physical length of the array
-   int m_iLastEntry;			// position of last entry on the heap array
-
-   pthread_mutex_t m_ListLock;
-
-   pthread_mutex_t* m_pWindowLock;
-   pthread_cond_t* m_pWindowCond;
-
-   CTimer* m_pTimer;
-
-private:
-   CSndUList(const CSndUList&);
-   CSndUList& operator=(const CSndUList&);
-};
-
-struct CRNode
-{
-   CUDT* m_pUDT;                // Pointer to the instance of CUDT socket
-   uint64_t m_llTimeStamp;      // Time Stamp
-
-   CRNode* m_pPrev;             // previous link
-   CRNode* m_pNext;             // next link
-
-   bool m_bOnList;              // if the node is already on the list
-};
-
-class CRcvUList
-{
-public:
-   CRcvUList();
-   ~CRcvUList();
-
-public:
-
-      // Functionality:
-      //    Insert a new UDT instance to the list.
-      // Parameters:
-      //    1) [in] u: pointer to the UDT instance
-      // Returned value:
-      //    None.
-
-   void insert(const CUDT* u);
-
-      // Functionality:
-      //    Remove the UDT instance from the list.
-      // Parameters:
-      //    1) [in] u: pointer to the UDT instance
-      // Returned value:
-      //    None.
-
-   void remove(const CUDT* u);
-
-      // Functionality:
-      //    Move the UDT instance to the end of the list, if it already exists; otherwise, do nothing.
-      // Parameters:
-      //    1) [in] u: pointer to the UDT instance
-      // Returned value:
-      //    None.
-
-   void update(const CUDT* u);
-
-public:
-   CRNode* m_pUList;		// the head node
-
-private:
-   CRNode* m_pLast;		// the last node
-
-private:
-   CRcvUList(const CRcvUList&);
-   CRcvUList& operator=(const CRcvUList&);
-};
-
-class CHash
-{
-public:
-   CHash();
-   ~CHash();
-
-public:
-
-      // Functionality:
-      //    Initialize the hash table.
-      // Parameters:
-      //    1) [in] size: hash table size
-      // Returned value:
-      //    None.
-
-   void init(int size);
-
-      // Functionality:
-      //    Look for a UDT instance from the hash table.
-      // Parameters:
-      //    1) [in] id: socket ID
-      // Returned value:
-      //    Pointer to a UDT instance, or NULL if not found.
-
-   CUDT* lookup(int32_t id);
-
-      // Functionality:
-      //    Insert an entry to the hash table.
-      // Parameters:
-      //    1) [in] id: socket ID
-      //    2) [in] u: pointer to the UDT instance
-      // Returned value:
-      //    None.
-
-   void insert(int32_t id, CUDT* u);
-
-      // Functionality:
-      //    Remove an entry from the hash table.
-      // Parameters:
-      //    1) [in] id: socket ID
-      // Returned value:
-      //    None.
-
-   void remove(int32_t id);
-
-private:
-   struct CBucket
-   {
-      int32_t m_iID;		// Socket ID
-      CUDT* m_pUDT;		// Socket instance
-
-      CBucket* m_pNext;		// next bucket
-   } **m_pBucket;		// list of buckets (the hash table)
-
-   int m_iHashSize;		// size of hash table
-
-private:
-   CHash(const CHash&);
-   CHash& operator=(const CHash&);
-};
-
-class CRendezvousQueue
-{
-public:
-   CRendezvousQueue();
-   ~CRendezvousQueue();
-
-public:
-   void insert(const UDTSOCKET& id, CUDT* u, int ipv, const sockaddr* addr, uint64_t ttl);
-   void remove(const UDTSOCKET& id);
-   CUDT* retrieve(const sockaddr* addr, UDTSOCKET& id);
-
-   void updateConnStatus();
-
-private:
-   struct CRL
-   {
-      UDTSOCKET m_iID;			// UDT socket ID (self)
-      CUDT* m_pUDT;			// UDT instance
-      int m_iIPversion;                 // IP version
-      sockaddr* m_pPeerAddr;		// UDT sonnection peer address
-      uint64_t m_ullTTL;			// the time that this request expires
-   };
-   std::list<CRL> m_lRendezvousID;      // The sockets currently in rendezvous mode
-
-   pthread_mutex_t m_RIDVectorLock;
-};
-
-class CSndQueue
-{
-friend class CUDT;
-friend class CUDTUnited;
-
-public:
-   CSndQueue();
-   ~CSndQueue();
-
-public:
-
-      // Functionality:
-      //    Initialize the sending queue.
-      // Parameters:
-      //    1) [in] c: UDP channel to be associated to the queue
-      //    2) [in] t: Timer
-      // Returned value:
-      //    None.
-
-   void init(CChannel* c, CTimer* t);
-
-      // Functionality:
-      //    Send out a packet to a given address.
-      // Parameters:
-      //    1) [in] addr: destination address
-      //    2) [in] packet: packet to be sent out
-      // Returned value:
-      //    Size of data sent out.
-
-   int sendto(const sockaddr* addr, CPacket& packet);
-
-private:
-#ifndef WIN32
-   static void* worker(void* param);
-#else
-   static DWORD WINAPI worker(LPVOID param);
-#endif
-
-   pthread_t m_WorkerThread;
-
-private:
-   CSndUList* m_pSndUList;		// List of UDT instances for data sending
-   CChannel* m_pChannel;                // The UDP channel for data sending
-   CTimer* m_pTimer;			// Timing facility
-
-   pthread_mutex_t m_WindowLock;
-   pthread_cond_t m_WindowCond;
-
-   volatile bool m_bClosing;		// closing the worker
-   pthread_cond_t m_ExitCond;
-
-private:
-   CSndQueue(const CSndQueue&);
-   CSndQueue& operator=(const CSndQueue&);
-};
-
-class CRcvQueue
-{
-friend class CUDT;
-friend class CUDTUnited;
-
-public:
-   CRcvQueue();
-   ~CRcvQueue();
-
-public:
-
-      // Functionality:
-      //    Initialize the receiving queue.
-      // Parameters:
-      //    1) [in] size: queue size
-      //    2) [in] mss: maximum packet size
-      //    3) [in] version: IP version
-      //    4) [in] hsize: hash table size
-      //    5) [in] c: UDP channel to be associated to the queue
-      //    6) [in] t: timer
-      // Returned value:
-      //    None.
-
-   void init(int size, int payload, int version, int hsize, CChannel* c, CTimer* t);
-
-      // Functionality:
-      //    Read a packet for a specific UDT socket id.
-      // Parameters:
-      //    1) [in] id: Socket ID
-      //    2) [out] packet: received packet
-      // Returned value:
-      //    Data size of the packet
-
-   int recvfrom(int32_t id, CPacket& packet);
-
-private:
-#ifndef WIN32
-   static void* worker(void* param);
-#else
-   static DWORD WINAPI worker(LPVOID param);
-#endif
-
-   pthread_t m_WorkerThread;
-
-private:
-   CUnitQueue m_UnitQueue;		// The received packet queue
-
-   CRcvUList* m_pRcvUList;		// List of UDT instances that will read packets from the queue
-   CHash* m_pHash;			// Hash table for UDT socket looking up
-   CChannel* m_pChannel;		// UDP channel for receving packets
-   CTimer* m_pTimer;			// shared timer with the snd queue
-
-   int m_iPayloadSize;                  // packet payload size
-
-   volatile bool m_bClosing;            // closing the workder
-   pthread_cond_t m_ExitCond;
-
-private:
-   int setListener(CUDT* u);
-   void removeListener(const CUDT* u);
-
-   void registerConnector(const UDTSOCKET& id, CUDT* u, int ipv, const sockaddr* addr, uint64_t ttl);
-   void removeConnector(const UDTSOCKET& id);
-
-   void setNewEntry(CUDT* u);
-   bool ifNewEntry();
-   CUDT* getNewEntry();
-
-   void storePkt(int32_t id, CPacket* pkt);
-
-private:
-   pthread_mutex_t m_LSLock;
-   CUDT* m_pListener;                                   // pointer to the (unique, if any) listening UDT entity
-   CRendezvousQueue* m_pRendezvousQueue;                // The list of sockets in rendezvous mode
-
-   std::vector<CUDT*> m_vNewEntry;                      // newly added entries, to be inserted
-   pthread_mutex_t m_IDLock;
-
-   std::map<int32_t, std::queue<CPacket*> > m_mBuffer;	// temporary buffer for rendezvous connection request
-   pthread_mutex_t m_PassLock;
-   pthread_cond_t m_PassCond;
-
-private:
-   CRcvQueue(const CRcvQueue&);
-   CRcvQueue& operator=(const CRcvQueue&);
-};
-
-struct CMultiplexer
-{
-   CSndQueue* m_pSndQueue;	// The sending queue
-   CRcvQueue* m_pRcvQueue;	// The receiving queue
-   CChannel* m_pChannel;	// The UDP channel for sending and receiving
-   CTimer* m_pTimer;		// The timer
-
-   int m_iPort;			// The UDP port number of this multiplexer
-   int m_iIPversion;		// IP version
-   int m_iMSS;			// Maximum Segment Size
-   int m_iRefCount;		// number of UDT instances that are associated with this multiplexer
-   bool m_bReusable;		// if this one can be shared with others
-
-   int m_iID;			// multiplexer ID
-};
-
-#endif
diff --git a/vendor/udt4/src/udt.h b/vendor/udt4/src/udt.h
deleted file mode 100644
index 7dc75a3..0000000
--- a/vendor/udt4/src/udt.h
+++ /dev/null
@@ -1,359 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/18/2011
-*****************************************************************************/
-
-#ifndef __UDT_H__
-#define __UDT_H__
-
-
-#ifndef WIN32
-   #include <sys/types.h>
-   #include <sys/socket.h>
-   #include <netinet/in.h>
-#else
-   #ifdef __MINGW__
-      #include <stdint.h>
-      #include <ws2tcpip.h>
-   #endif
-   #include <windows.h>
-#endif
-#include <fstream>
-#include <set>
-#include <string>
-#include <vector>
-
-#include <stdint.h>
-
-
-////////////////////////////////////////////////////////////////////////////////
-
-//if compiling on VC6.0 or pre-WindowsXP systems
-//use -DLEGACY_WIN32
-
-//if compiling with MinGW, it only works on XP or above
-//use -D_WIN32_WINNT=0x0501
-
-
-#ifdef WIN32
-   #if !defined(__MINGW__) && defined(UDT_IS_DLL)
-      // Explicitly define 32-bit and 64-bit numbers
-      typedef __int32 int32_t;
-      typedef __int64 int64_t;
-      typedef unsigned __int32 uint32_t;
-      #ifndef LEGACY_WIN32
-         typedef unsigned __int64 uint64_t;
-      #else
-         // VC 6.0 does not support unsigned __int64: may cause potential problems.
-         typedef __int64 uint64_t;
-      #endif
-
-      #ifdef UDT_EXPORTS
-         #define UDT_API __declspec(dllexport)
-      #else
-         #define UDT_API __declspec(dllimport)
-      #endif
-   #else
-      #define UDT_API
-   #endif
-#else
-   #define UDT_API __attribute__ ((visibility("default")))
-#endif
-
-#define NO_BUSY_WAITING
-
-#ifdef WIN32
-   #ifndef __MINGW__
-      typedef SOCKET SYSSOCKET;
-   #else
-      typedef int SYSSOCKET;
-   #endif
-#else
-   typedef int SYSSOCKET;
-#endif
-
-typedef SYSSOCKET UDPSOCKET;
-typedef int UDTSOCKET;
-
-////////////////////////////////////////////////////////////////////////////////
-
-typedef std::set<UDTSOCKET> ud_set;
-#define UD_CLR(u, uset) ((uset)->erase(u))
-#define UD_ISSET(u, uset) ((uset)->find(u) != (uset)->end())
-#define UD_SET(u, uset) ((uset)->insert(u))
-#define UD_ZERO(uset) ((uset)->clear())
-
-enum EPOLLOpt
-{
-   // this values are defined same as linux epoll.h
-   // so that if system values are used by mistake, they should have the same effect
-   UDT_EPOLL_IN = 0x1,
-   UDT_EPOLL_OUT = 0x4,
-   UDT_EPOLL_ERR = 0x8
-};
-
-enum UDTSTATUS {INIT = 1, OPENED, LISTENING, CONNECTING, CONNECTED, BROKEN, CLOSING, CLOSED, NONEXIST};
-
-////////////////////////////////////////////////////////////////////////////////
-
-enum UDTOpt
-{
-   UDT_MSS,             // the Maximum Transfer Unit
-   UDT_SNDSYN,          // if sending is blocking
-   UDT_RCVSYN,          // if receiving is blocking
-   UDT_CC,              // custom congestion control algorithm
-   UDT_FC,		// Flight flag size (window size)
-   UDT_SNDBUF,          // maximum buffer in sending queue
-   UDT_RCVBUF,          // UDT receiving buffer size
-   UDT_LINGER,          // waiting for unsent data when closing
-   UDP_SNDBUF,          // UDP sending buffer size
-   UDP_RCVBUF,          // UDP receiving buffer size
-   UDT_MAXMSG,          // maximum datagram message size
-   UDT_MSGTTL,          // time-to-live of a datagram message
-   UDT_RENDEZVOUS,      // rendezvous connection mode
-   UDT_SNDTIMEO,        // send() timeout
-   UDT_RCVTIMEO,        // recv() timeout
-   UDT_REUSEADDR,	// reuse an existing port or create a new one
-   UDT_MAXBW,		// maximum bandwidth (bytes per second) that the connection can use
-   UDT_STATE,		// current socket state, see UDTSTATUS, read only
-   UDT_EVENT,		// current avalable events associated with the socket
-   UDT_SNDDATA,		// size of data in the sending buffer
-   UDT_RCVDATA		// size of data available for recv
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-struct CPerfMon
-{
-   // global measurements
-   int64_t msTimeStamp;                 // time since the UDT entity is started, in milliseconds
-   int64_t pktSentTotal;                // total number of sent data packets, including retransmissions
-   int64_t pktRecvTotal;                // total number of received packets
-   int pktSndLossTotal;                 // total number of lost packets (sender side)
-   int pktRcvLossTotal;                 // total number of lost packets (receiver side)
-   int pktRetransTotal;                 // total number of retransmitted packets
-   int pktSentACKTotal;                 // total number of sent ACK packets
-   int pktRecvACKTotal;                 // total number of received ACK packets
-   int pktSentNAKTotal;                 // total number of sent NAK packets
-   int pktRecvNAKTotal;                 // total number of received NAK packets
-   int64_t usSndDurationTotal;		// total time duration when UDT is sending data (idle time exclusive)
-
-   // local measurements
-   int64_t pktSent;                     // number of sent data packets, including retransmissions
-   int64_t pktRecv;                     // number of received packets
-   int pktSndLoss;                      // number of lost packets (sender side)
-   int pktRcvLoss;                      // number of lost packets (receiver side)
-   int pktRetrans;                      // number of retransmitted packets
-   int pktSentACK;                      // number of sent ACK packets
-   int pktRecvACK;                      // number of received ACK packets
-   int pktSentNAK;                      // number of sent NAK packets
-   int pktRecvNAK;                      // number of received NAK packets
-   double mbpsSendRate;                 // sending rate in Mb/s
-   double mbpsRecvRate;                 // receiving rate in Mb/s
-   int64_t usSndDuration;		// busy sending time (i.e., idle time exclusive)
-
-   // instant measurements
-   double usPktSndPeriod;               // packet sending period, in microseconds
-   int pktFlowWindow;                   // flow window size, in number of packets
-   int pktCongestionWindow;             // congestion window size, in number of packets
-   int pktFlightSize;                   // number of packets on flight
-   double msRTT;                        // RTT, in milliseconds
-   double mbpsBandwidth;                // estimated bandwidth, in Mb/s
-   int byteAvailSndBuf;                 // available UDT sender buffer size
-   int byteAvailRcvBuf;                 // available UDT receiver buffer size
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class UDT_API CUDTException
-{
-public:
-   CUDTException(int major = 0, int minor = 0, int err = -1);
-   CUDTException(const CUDTException& e);
-   virtual ~CUDTException();
-
-      // Functionality:
-      //    Get the description of the exception.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Text message for the exception description.
-
-   virtual const char* getErrorMessage();
-
-      // Functionality:
-      //    Get the system errno for the exception.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    errno.
-
-   virtual int getErrorCode() const;
-
-      // Functionality:
-      //    Clear the error code.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   virtual void clear();
-
-private:
-   int m_iMajor;        // major exception categories
-
-// 0: correct condition
-// 1: network setup exception
-// 2: network connection broken
-// 3: memory exception
-// 4: file exception
-// 5: method not supported
-// 6+: undefined error
-
-   int m_iMinor;		// for specific error reasons
-   int m_iErrno;		// errno returned by the system if there is any
-   std::string m_strMsg;	// text error message
-
-   std::string m_strAPI;	// the name of UDT function that returns the error
-   std::string m_strDebug;	// debug information, set to the original place that causes the error
-
-public: // Error Code
-   static const int SUCCESS;
-   static const int ECONNSETUP;
-   static const int ENOSERVER;
-   static const int ECONNREJ;
-   static const int ESOCKFAIL;
-   static const int ESECFAIL;
-   static const int ECONNFAIL;
-   static const int ECONNLOST;
-   static const int ENOCONN;
-   static const int ERESOURCE;
-   static const int ETHREAD;
-   static const int ENOBUF;
-   static const int EFILE;
-   static const int EINVRDOFF;
-   static const int ERDPERM;
-   static const int EINVWROFF;
-   static const int EWRPERM;
-   static const int EINVOP;
-   static const int EBOUNDSOCK;
-   static const int ECONNSOCK;
-   static const int EINVPARAM;
-   static const int EINVSOCK;
-   static const int EUNBOUNDSOCK;
-   static const int ENOLISTEN;
-   static const int ERDVNOSERV;
-   static const int ERDVUNBOUND;
-   static const int ESTREAMILL;
-   static const int EDGRAMILL;
-   static const int EDUPLISTEN;
-   static const int ELARGEMSG;
-   static const int EINVPOLLID;
-   static const int EASYNCFAIL;
-   static const int EASYNCSND;
-   static const int EASYNCRCV;
-   static const int ETIMEOUT;
-   static const int EPEERERR;
-   static const int EUNKNOWN;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-// If you need to export these APIs to be used by a different language,
-// declare extern "C" for them, and add a "udt_" prefix to each API.
-// The following APIs: sendfile(), recvfile(), epoll_wait(), geterrormsg(),
-// include C++ specific feature, please use the corresponding sendfile2(), etc.
-
-namespace UDT
-{
-
-typedef CUDTException ERRORINFO;
-typedef UDTOpt SOCKOPT;
-typedef CPerfMon TRACEINFO;
-typedef ud_set UDSET;
-
-UDT_API extern const UDTSOCKET INVALID_SOCK;
-#undef ERROR
-UDT_API extern const int ERROR;
-
-UDT_API int startup();
-UDT_API int cleanup();
-UDT_API UDTSOCKET socket(int af, int type, int protocol);
-UDT_API int bind(UDTSOCKET u, const struct sockaddr* name, int namelen);
-UDT_API int bind2(UDTSOCKET u, UDPSOCKET udpsock);
-UDT_API int listen(UDTSOCKET u, int backlog);
-UDT_API UDTSOCKET accept(UDTSOCKET u, struct sockaddr* addr, int* addrlen);
-UDT_API int connect(UDTSOCKET u, const struct sockaddr* name, int namelen);
-UDT_API int close(UDTSOCKET u);
-UDT_API int getpeername(UDTSOCKET u, struct sockaddr* name, int* namelen);
-UDT_API int getsockname(UDTSOCKET u, struct sockaddr* name, int* namelen);
-UDT_API int getsockopt(UDTSOCKET u, int level, SOCKOPT optname, void* optval, int* optlen);
-UDT_API int setsockopt(UDTSOCKET u, int level, SOCKOPT optname, const void* optval, int optlen);
-UDT_API int send(UDTSOCKET u, const char* buf, int len, int flags);
-UDT_API int recv(UDTSOCKET u, char* buf, int len, int flags);
-UDT_API int sendmsg(UDTSOCKET u, const char* buf, int len, int ttl = -1, bool inorder = false);
-UDT_API int recvmsg(UDTSOCKET u, char* buf, int len);
-UDT_API int64_t sendfile(UDTSOCKET u, std::fstream& ifs, int64_t& offset, int64_t size, int block = 364000);
-UDT_API int64_t recvfile(UDTSOCKET u, std::fstream& ofs, int64_t& offset, int64_t size, int block = 7280000);
-UDT_API int64_t sendfile2(UDTSOCKET u, const char* path, int64_t* offset, int64_t size, int block = 364000);
-UDT_API int64_t recvfile2(UDTSOCKET u, const char* path, int64_t* offset, int64_t size, int block = 7280000);
-
-// select and selectEX are DEPRECATED; please use epoll. 
-UDT_API int select(int nfds, UDSET* readfds, UDSET* writefds, UDSET* exceptfds, const struct timeval* timeout);
-UDT_API int selectEx(const std::vector<UDTSOCKET>& fds, std::vector<UDTSOCKET>* readfds,
-                     std::vector<UDTSOCKET>* writefds, std::vector<UDTSOCKET>* exceptfds, int64_t msTimeOut);
-
-UDT_API int epoll_create();
-UDT_API int epoll_add_usock(int eid, UDTSOCKET u, const int* events = NULL);
-UDT_API int epoll_add_ssock(int eid, SYSSOCKET s, const int* events = NULL);
-UDT_API int epoll_remove_usock(int eid, UDTSOCKET u);
-UDT_API int epoll_remove_ssock(int eid, SYSSOCKET s);
-UDT_API int epoll_wait(int eid, std::set<UDTSOCKET>* readfds, std::set<UDTSOCKET>* writefds, int64_t msTimeOut,
-                       std::set<SYSSOCKET>* lrfds = NULL, std::set<SYSSOCKET>* wrfds = NULL);
-UDT_API int epoll_wait2(int eid, UDTSOCKET* readfds, int* rnum, UDTSOCKET* writefds, int* wnum, int64_t msTimeOut,
-                        SYSSOCKET* lrfds = NULL, int* lrnum = NULL, SYSSOCKET* lwfds = NULL, int* lwnum = NULL);
-UDT_API int epoll_release(int eid);
-UDT_API ERRORINFO& getlasterror();
-UDT_API int getlasterror_code();
-UDT_API const char* getlasterror_desc();
-UDT_API int perfmon(UDTSOCKET u, TRACEINFO* perf, bool clear = true);
-UDT_API UDTSTATUS getsockstate(UDTSOCKET u);
-
-}  // namespace UDT
-
-#endif
diff --git a/vendor/udt4/src/window.cpp b/vendor/udt4/src/window.cpp
deleted file mode 100644
index bca37e9..0000000
--- a/vendor/udt4/src/window.cpp
+++ /dev/null
@@ -1,286 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/22/2011
-*****************************************************************************/
-
-#include <cmath>
-#include "common.h"
-#include "window.h"
-#include <algorithm>
-
-using namespace std;
-
-CACKWindow::CACKWindow(int size):
-m_piACKSeqNo(NULL),
-m_piACK(NULL),
-m_pTimeStamp(NULL),
-m_iSize(size),
-m_iHead(0),
-m_iTail(0)
-{
-   m_piACKSeqNo = new int32_t[m_iSize];
-   m_piACK = new int32_t[m_iSize];
-   m_pTimeStamp = new uint64_t[m_iSize];
-
-   m_piACKSeqNo[0] = -1;
-}
-
-CACKWindow::~CACKWindow()
-{
-   delete [] m_piACKSeqNo;
-   delete [] m_piACK;
-   delete [] m_pTimeStamp;
-}
-
-void CACKWindow::store(int32_t seq, int32_t ack)
-{
-   m_piACKSeqNo[m_iHead] = seq;
-   m_piACK[m_iHead] = ack;
-   m_pTimeStamp[m_iHead] = CTimer::getTime();
-
-   m_iHead = (m_iHead + 1) % m_iSize;
-
-   // overwrite the oldest ACK since it is not likely to be acknowledged
-   if (m_iHead == m_iTail)
-      m_iTail = (m_iTail + 1) % m_iSize;
-}
-
-int CACKWindow::acknowledge(int32_t seq, int32_t& ack)
-{
-   if (m_iHead >= m_iTail)
-   {
-      // Head has not exceeded the physical boundary of the window
-
-      for (int i = m_iTail, n = m_iHead; i < n; ++ i)
-      {
-         // looking for indentical ACK Seq. No.
-         if (seq == m_piACKSeqNo[i])
-         {
-            // return the Data ACK it carried
-            ack = m_piACK[i];
-
-            // calculate RTT
-            int rtt = int(CTimer::getTime() - m_pTimeStamp[i]);
-
-            if (i + 1 == m_iHead)
-            {
-               m_iTail = m_iHead = 0;
-               m_piACKSeqNo[0] = -1;
-            }
-            else
-               m_iTail = (i + 1) % m_iSize;
-
-            return rtt;
-         }
-      }
-
-      // Bad input, the ACK node has been overwritten
-      return -1;
-   }
-
-   // Head has exceeded the physical window boundary, so it is behind tail
-   for (int j = m_iTail, n = m_iHead + m_iSize; j < n; ++ j)
-   {
-      // looking for indentical ACK seq. no.
-      if (seq == m_piACKSeqNo[j % m_iSize])
-      {
-         // return Data ACK
-         j %= m_iSize;
-         ack = m_piACK[j];
-
-         // calculate RTT
-         int rtt = int(CTimer::getTime() - m_pTimeStamp[j]);
-
-         if (j == m_iHead)
-         {
-            m_iTail = m_iHead = 0;
-            m_piACKSeqNo[0] = -1;
-         }
-         else
-            m_iTail = (j + 1) % m_iSize;
-
-         return rtt;
-      }
-   }
-
-   // bad input, the ACK node has been overwritten
-   return -1;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-CPktTimeWindow::CPktTimeWindow(int asize, int psize):
-m_iAWSize(asize),
-m_piPktWindow(NULL),
-m_iPktWindowPtr(0),
-m_iPWSize(psize),
-m_piProbeWindow(NULL),
-m_iProbeWindowPtr(0),
-m_iLastSentTime(0),
-m_iMinPktSndInt(1000000),
-m_LastArrTime(),
-m_CurrArrTime(),
-m_ProbeTime()
-{
-   m_piPktWindow = new int[m_iAWSize];
-   m_piPktReplica = new int[m_iAWSize];
-   m_piProbeWindow = new int[m_iPWSize];
-   m_piProbeReplica = new int[m_iPWSize];
-
-   m_LastArrTime = CTimer::getTime();
-
-   for (int i = 0; i < m_iAWSize; ++ i)
-      m_piPktWindow[i] = 1000000;
-
-   for (int k = 0; k < m_iPWSize; ++ k)
-      m_piProbeWindow[k] = 1000;
-}
-
-CPktTimeWindow::~CPktTimeWindow()
-{
-   delete [] m_piPktWindow;
-   delete [] m_piPktReplica;
-   delete [] m_piProbeWindow;
-   delete [] m_piProbeReplica;
-}
-
-int CPktTimeWindow::getMinPktSndInt() const
-{
-   return m_iMinPktSndInt;
-}
-
-int CPktTimeWindow::getPktRcvSpeed() const
-{
-   // get median value, but cannot change the original value order in the window
-   std::copy(m_piPktWindow, m_piPktWindow + m_iAWSize - 1, m_piPktReplica);
-   std::nth_element(m_piPktReplica, m_piPktReplica + (m_iAWSize / 2), m_piPktReplica + m_iAWSize - 1);
-   int median = m_piPktReplica[m_iAWSize / 2];
-
-   int count = 0;
-   int sum = 0;
-   int upper = median << 3;
-   int lower = median >> 3;
-
-   // median filtering
-   int* p = m_piPktWindow;
-   for (int i = 0, n = m_iAWSize; i < n; ++ i)
-   {
-      if ((*p < upper) && (*p > lower))
-      {
-         ++ count;
-         sum += *p;
-      }
-      ++ p;
-   }
-
-   // claculate speed, or return 0 if not enough valid value
-   if (count > (m_iAWSize >> 1))
-      return (int)ceil(1000000.0 / (sum / count));
-   else
-      return 0;
-}
-
-int CPktTimeWindow::getBandwidth() const
-{
-   // get median value, but cannot change the original value order in the window
-   std::copy(m_piProbeWindow, m_piProbeWindow + m_iPWSize - 1, m_piProbeReplica);
-   std::nth_element(m_piProbeReplica, m_piProbeReplica + (m_iPWSize / 2), m_piProbeReplica + m_iPWSize - 1);
-   int median = m_piProbeReplica[m_iPWSize / 2];
-
-   int count = 1;
-   int sum = median;
-   int upper = median << 3;
-   int lower = median >> 3;
-
-   // median filtering
-   int* p = m_piProbeWindow;
-   for (int i = 0, n = m_iPWSize; i < n; ++ i)
-   {
-      if ((*p < upper) && (*p > lower))
-      {
-         ++ count;
-         sum += *p;
-      }
-      ++ p;
-   }
-
-   return (int)ceil(1000000.0 / (double(sum) / double(count)));
-}
-
-void CPktTimeWindow::onPktSent(int currtime)
-{
-   int interval = currtime - m_iLastSentTime;
-
-   if ((interval < m_iMinPktSndInt) && (interval > 0))
-      m_iMinPktSndInt = interval;
-
-   m_iLastSentTime = currtime;
-}
-
-void CPktTimeWindow::onPktArrival()
-{
-   m_CurrArrTime = CTimer::getTime();
-
-   // record the packet interval between the current and the last one
-   *(m_piPktWindow + m_iPktWindowPtr) = int(m_CurrArrTime - m_LastArrTime);
-
-   // the window is logically circular
-   ++ m_iPktWindowPtr;
-   if (m_iPktWindowPtr == m_iAWSize)
-      m_iPktWindowPtr = 0;
-
-   // remember last packet arrival time
-   m_LastArrTime = m_CurrArrTime;
-}
-
-void CPktTimeWindow::probe1Arrival()
-{
-   m_ProbeTime = CTimer::getTime();
-}
-
-void CPktTimeWindow::probe2Arrival()
-{
-   m_CurrArrTime = CTimer::getTime();
-
-   // record the probing packets interval
-   *(m_piProbeWindow + m_iProbeWindowPtr) = int(m_CurrArrTime - m_ProbeTime);
-   // the window is logically circular
-   ++ m_iProbeWindowPtr;
-   if (m_iProbeWindowPtr == m_iPWSize)
-      m_iProbeWindowPtr = 0;
-}
diff --git a/vendor/udt4/src/window.h b/vendor/udt4/src/window.h
deleted file mode 100644
index f118a26..0000000
--- a/vendor/udt4/src/window.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/*****************************************************************************
-Copyright (c) 2001 - 2011, The Board of Trustees of the University of Illinois.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above
-  copyright notice, this list of conditions and the
-  following disclaimer.
-
-* Redistributions in binary form must reproduce the
-  above copyright notice, this list of conditions
-  and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the University of Illinois
-  nor the names of its contributors may be used to
-  endorse or promote products derived from this
-  software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*****************************************************************************/
-
-/*****************************************************************************
-written by
-   Yunhong Gu, last updated 01/22/2011
-*****************************************************************************/
-
-#ifndef __UDT_WINDOW_H__
-#define __UDT_WINDOW_H__
-
-
-#ifndef WIN32
-   #include <sys/time.h>
-   #include <time.h>
-#endif
-#include "udt.h"
-
-
-class CACKWindow
-{
-public:
-   CACKWindow(int size = 1024);
-   ~CACKWindow();
-
-      // Functionality:
-      //    Write an ACK record into the window.
-      // Parameters:
-      //    0) [in] seq: ACK seq. no.
-      //    1) [in] ack: DATA ACK no.
-      // Returned value:
-      //    None.
-
-   void store(int32_t seq, int32_t ack);
-
-      // Functionality:
-      //    Search the ACK-2 "seq" in the window, find out the DATA "ack" and caluclate RTT .
-      // Parameters:
-      //    0) [in] seq: ACK-2 seq. no.
-      //    1) [out] ack: the DATA ACK no. that matches the ACK-2 no.
-      // Returned value:
-      //    RTT.
-
-   int acknowledge(int32_t seq, int32_t& ack);
-
-private:
-   int32_t* m_piACKSeqNo;       // Seq. No. for the ACK packet
-   int32_t* m_piACK;            // Data Seq. No. carried by the ACK packet
-   uint64_t* m_pTimeStamp;      // The timestamp when the ACK was sent
-
-   int m_iSize;                 // Size of the ACK history window
-   int m_iHead;                 // Pointer to the lastest ACK record
-   int m_iTail;                 // Pointer to the oldest ACK record
-
-private:
-   CACKWindow(const CACKWindow&);
-   CACKWindow& operator=(const CACKWindow&);
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-class CPktTimeWindow
-{
-public:
-   CPktTimeWindow(int asize = 16, int psize = 16);
-   ~CPktTimeWindow();
-
-      // Functionality:
-      //    read the minimum packet sending interval.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    minimum packet sending interval (microseconds).
-
-   int getMinPktSndInt() const;
-
-      // Functionality:
-      //    Calculate the packes arrival speed.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Packet arrival speed (packets per second).
-
-   int getPktRcvSpeed() const;
-
-      // Functionality:
-      //    Estimate the bandwidth.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    Estimated bandwidth (packets per second).
-
-   int getBandwidth() const;
-
-      // Functionality:
-      //    Record time information of a packet sending.
-      // Parameters:
-      //    0) currtime: timestamp of the packet sending.
-      // Returned value:
-      //    None.
-
-   void onPktSent(int currtime);
-
-      // Functionality:
-      //    Record time information of an arrived packet.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void onPktArrival();
-
-      // Functionality:
-      //    Record the arrival time of the first probing packet.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void probe1Arrival();
-
-      // Functionality:
-      //    Record the arrival time of the second probing packet and the interval between packet pairs.
-      // Parameters:
-      //    None.
-      // Returned value:
-      //    None.
-
-   void probe2Arrival();
-
-private:
-   int m_iAWSize;               // size of the packet arrival history window
-   int* m_piPktWindow;          // packet information window
-   int* m_piPktReplica;
-   int m_iPktWindowPtr;         // position pointer of the packet info. window.
-
-   int m_iPWSize;               // size of probe history window size
-   int* m_piProbeWindow;        // record inter-packet time for probing packet pairs
-   int* m_piProbeReplica;
-   int m_iProbeWindowPtr;       // position pointer to the probing window
-
-   int m_iLastSentTime;         // last packet sending time
-   int m_iMinPktSndInt;         // Minimum packet sending interval
-
-   uint64_t m_LastArrTime;      // last packet arrival time
-   uint64_t m_CurrArrTime;      // current packet arrival time
-   uint64_t m_ProbeTime;        // arrival time of the first probing packet
-
-private:
-   CPktTimeWindow(const CPktTimeWindow&);
-   CPktTimeWindow &operator=(const CPktTimeWindow&);
-};
-
-
-#endif

From 5e83b581c0ab466c47b276c56a36e2d922175f90 Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nathan@followmyvote.com>
Date: Thu, 17 Mar 2016 17:27:21 -0500
Subject: [PATCH 070/108] Prevent websocketpp from polluting installs

When clients of fc (such as graphene) do an install (via `make install` or similar), websocketpp was installing as well. This commit prevents this from happening.
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6d7774..af13b22 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -251,7 +251,7 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/git_revision.cpp.in" "${CMAKE_CU
 list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp")
 list(APPEND sources ${fc_headers})
 
-add_subdirectory( vendor/websocketpp )
+add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL )
 add_subdirectory( vendor/equihash )
 
 setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY )

From 159daffb25ba33d5bbceda312b8c75df5129f90f Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nathan@followmyvote.com>
Date: Thu, 17 Mar 2016 17:41:22 -0500
Subject: [PATCH 071/108] Fix installation

FC now installs properly with a `make install`
---
 CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af13b22..39f1dca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -254,7 +254,8 @@ list(APPEND sources ${fc_headers})
 add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL )
 add_subdirectory( vendor/equihash )
 
-setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC DONT_INSTALL_LIBRARY )
+setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC )
+install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include )
 
 # begin readline stuff
 find_package(Curses)

From ca9a6977d93df48e12d92e675c1a66fa9f6065cf Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nathan@followmyvote.com>
Date: Tue, 22 Mar 2016 17:19:47 -0500
Subject: [PATCH 072/108] Add cryptonomex's custom secp256k1 to install on
 non-Windows

This should be done on Windows too, but I don't know how and I don't
have a Windows test box anyways.
---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 39f1dca..fd6d201 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,6 +98,7 @@ else ( MSVC )
     set_property(TARGET secp256k1 PROPERTY IMPORTED_LOCATION ${binary_dir}/.libs/libsecp256k1${CMAKE_STATIC_LIBRARY_SUFFIX})
     set_property(TARGET secp256k1 PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp/include)
     add_dependencies(secp256k1 project_secp256k1)
+    install( FILES ${binary_dir}/.libs/libsecp256k1${CMAKE_STATIC_LIBRARY_SUFFIX} DESTINATION lib/cryptonomex )
 endif ( MSVC )
 # End configure secp256k1-zkp
 

From c23bbfb06875d9b26fb17542390446b43ef0e0bf Mon Sep 17 00:00:00 2001
From: SynaptiCAD User <syncad@dhcp215.syncad.com>
Date: Mon, 9 Jan 2017 10:53:34 -0500
Subject: [PATCH 073/108] Fix GetGitRevisionDescription to work with newer
 versions of git, which use absolute paths in the .git files of submodules

---
 GitVersionGen/GetGitRevisionDescription.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GitVersionGen/GetGitRevisionDescription.cmake b/GitVersionGen/GetGitRevisionDescription.cmake
index 00f8727..2b4a479 100644
--- a/GitVersionGen/GetGitRevisionDescription.cmake
+++ b/GitVersionGen/GetGitRevisionDescription.cmake
@@ -58,7 +58,7 @@ function(get_git_head_revision _refspecvar _hashvar)
 		file(READ ${GIT_DIR} submodule)
 		string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
 		get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
-		get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
+		get_filename_component(GIT_DIR ${GIT_DIR_RELATIVE} ABSOLUTE BASE_DIR ${SUBMODULE_DIR})
 	endif()
 	set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
 	if(NOT EXISTS "${GIT_DATA}")

From df2642e9311b6d4d29729ac6a7d9ef65206afc89 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Fri, 13 Jan 2017 13:34:44 -0600
Subject: [PATCH 074/108] Revert "Windows build fixes (disable compiling
 permessage-deflate, which isn't very useful right now.  The build error will
 probably be resolved in websocketpp by the time we need it)"

This reverts commit 2bd8e92a756c4e9e3d43c6e5c2aebddaf6b7db27.
---
 CMakeLists.txt                 |  1 -
 src/network/http/websocket.cpp | 42 +++++-----------------------------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e6b1b..f1bcdce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -317,7 +317,6 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/udt4/src
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/websocketpp
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
-    ${ZLIB_INCLUDE_DIR}
   )
 
 #target_link_libraries( fc PUBLIC udt ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index b8a3d3c..81a7cad 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -1,19 +1,9 @@
 #include <fc/network/http/websocket.hpp>
-
-#ifndef WIN32 
-// websocket++ currently does not build correctly with permessage deflate enabled
-// since chrome does not work with websocketpp's implementation of permessage-deflate
-// yet, I'm just disabling it on windows instead of trying to fix the build error.
-# define ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-#endif
-
 #include <websocketpp/config/asio_client.hpp>
 #include <websocketpp/config/asio.hpp>
 #include <websocketpp/server.hpp>
 #include <websocketpp/config/asio_client.hpp>
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-# include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-#endif
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
 #include <websocketpp/client.hpp>
 #include <websocketpp/logger/stub.hpp>
 
@@ -66,8 +56,7 @@ namespace fc { namespace http {
           // override default value of 5 sec timeout
           static const long timeout_open_handshake = 0;
       };
-
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
+      
       struct asio_with_stub_log_and_deflate : public websocketpp::config::asio {
           typedef asio_with_stub_log_and_deflate type;
           typedef asio base;
@@ -109,7 +98,6 @@ namespace fc { namespace http {
           // override default value of 5 sec timeout
           static const long timeout_open_handshake = 0;
       };
-#endif ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
 
       struct asio_tls_stub_log : public websocketpp::config::asio_tls {
           typedef asio_tls_stub_log type;
@@ -144,7 +132,6 @@ namespace fc { namespace http {
               transport_type;
       };
 
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
       struct asio_tls_stub_log_and_deflate : public websocketpp::config::asio_tls {
           typedef asio_tls_stub_log_and_deflate type;
           typedef asio_tls base;
@@ -182,7 +169,6 @@ namespace fc { namespace http {
           typedef websocketpp::extensions::permessage_deflate::enabled
               <permessage_deflate_config> permessage_deflate_type;
       };
-#endif
 
       using websocketpp::connection_hdl;
 
@@ -527,18 +513,10 @@ namespace fc { namespace http {
    } // namespace detail
 
    websocket_server::websocket_server(bool enable_permessage_deflate /* = true */) :
-      my( 
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-          enable_permessage_deflate ? 
+      my( enable_permessage_deflate ? 
             (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log_and_deflate> : 
-#endif
             (detail::abstract_websocket_server*)new detail::websocket_server_impl<detail::asio_with_stub_log> ) 
-   {
-#ifndef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-     if (enable_permessage_deflate)
-       elog("Websocket permessage-deflate requested but not enabled during compile");
-#endif
-   }
+   {}
    websocket_server::~websocket_server(){}
 
    void websocket_server::on_connection( const on_connection_handler& handler )
@@ -565,18 +543,10 @@ namespace fc { namespace http {
    websocket_tls_server::websocket_tls_server(const string& server_pem, 
                                               const string& ssl_password, 
                                               bool enable_permessage_deflate /* = true */) :
-      my(
-#ifdef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-          enable_permessage_deflate ? 
+      my( enable_permessage_deflate ? 
             (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log_and_deflate>(server_pem, ssl_password) : 
-#endif
             (detail::abstract_websocket_server*)new detail::websocket_tls_server_impl<detail::asio_tls_stub_log>(server_pem, ssl_password) ) 
-   {
-#ifndef ENABLE_WEBSOCKET_PERMESSAGE_DEFLATE
-     if (enable_permessage_deflate)
-       elog("Websocket permessage-deflate requested but not enabled during compile");
-#endif
-   }
+   {}
    websocket_tls_server::~websocket_tls_server(){}
 
    void websocket_tls_server::on_connection( const on_connection_handler& handler )

From 9d383077fa754fb872184526c2d5b9ba04708c86 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Fri, 13 Jan 2017 13:35:48 -0600
Subject: [PATCH 075/108] Revert "change json seralization of map<string,T> to
 be object rather than array of pairs"

This reverts commit a421e280488385cab26a42153f7ce3c8d5b6281f.
---
 include/fc/variant.hpp        |  9 ---------
 include/fc/variant_object.hpp | 36 -----------------------------------
 src/rpc/websocket_api.cpp     |  1 -
 src/variant_object.cpp        |  1 -
 4 files changed, 47 deletions(-)

diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp
index ccb2960..092de0a 100644
--- a/include/fc/variant.hpp
+++ b/include/fc/variant.hpp
@@ -93,17 +93,10 @@ namespace fc
    template<typename K, typename... T>
    void from_variant( const variant& var, fc::flat_map<K,T...>& vo );
 
-   template<typename T>
-   void to_variant( const std::map<string,T>& var,  variant& vo );
-   template<typename T>
-   void from_variant( const variant& var,  std::map<string,T>& vo );
-
    template<typename K, typename T>
    void to_variant( const std::map<K,T>& var,  variant& vo );
    template<typename K, typename T>
    void from_variant( const variant& var,  std::map<K,T>& vo );
-
-
    template<typename K, typename T>
    void to_variant( const std::multimap<K,T>& var,  variant& vo );
    template<typename K, typename T>
@@ -414,8 +407,6 @@ namespace fc
          vo.insert( itr->as< std::pair<K,T> >() );
 
    }
-
-
    template<typename K, typename T>
    void to_variant( const std::map<K, T>& var,  variant& vo )
    {
diff --git a/include/fc/variant_object.hpp b/include/fc/variant_object.hpp
index 99b0d86..5a39c80 100644
--- a/include/fc/variant_object.hpp
+++ b/include/fc/variant_object.hpp
@@ -5,7 +5,6 @@
 
 namespace fc
 {
-   using std::map;
    class mutable_variant_object;
    
    /**
@@ -67,15 +66,6 @@ namespace fc
 
       /** initializes the first key/value pair in the object */
       variant_object( string key, variant val );
-
-      template<typename T>
-      variant_object( const map<string,T>& values )
-      :_key_value( new std::vector<entry>() ) {
-         _key_value->reserve( values.size() );
-         for( const auto& item : values ) {
-            _key_value->emplace_back( entry( item.first, fc::variant(item.second) ) );
-         }
-      }
        
       template<typename T>
       variant_object( string key, T&& val )
@@ -206,15 +196,6 @@ namespace fc
 
       mutable_variant_object();
 
-      template<typename T>
-      mutable_variant_object( const map<string,T>& values )
-      :_key_value( new std::vector<entry>() ) {
-         _key_value->reserve( values.size() );
-         for( const auto& item : values ) {
-            _key_value->emplace_back( variant_object::entry( item.first, fc::variant(item.second) ) );
-         }
-      }
-
       /** initializes the first key/value pair in the object */
       mutable_variant_object( string key, variant val );
       template<typename T>
@@ -231,8 +212,6 @@ namespace fc
       mutable_variant_object& operator=( mutable_variant_object&& );
       mutable_variant_object& operator=( const mutable_variant_object& );
       mutable_variant_object& operator=( const variant_object& );
-
-
    private:
       std::unique_ptr< std::vector< entry > > _key_value;
       friend class variant_object;
@@ -242,19 +221,4 @@ namespace fc
    /** @ingroup Serializable */
    void from_variant( const variant& var,  mutable_variant_object& vo );
 
-   template<typename T>
-   void to_variant( const std::map<string, T>& var,  variant& vo )
-   {
-       vo = variant_object( var );
-   }
-
-   template<typename T>
-   void from_variant( const variant& var,  std::map<string, T>& vo )
-   {
-      const auto& obj = var.get_object();
-      vo.clear();
-      for( auto itr = obj.begin(); itr != obj.end(); ++itr )
-         vo[itr->key()] = itr->value().as<T>();
-   }
-
 } // namespace fc
diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index 0ff9304..6342b6f 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -85,7 +85,6 @@ std::string websocket_api_connection::on_message(
    const std::string& message,
    bool send_message /* = true */ )
 {
-   wdump((message));
    try
    {
       auto var = fc::json::from_string(message);
diff --git a/src/variant_object.cpp b/src/variant_object.cpp
index 38851b0..6f3b1dc 100644
--- a/src/variant_object.cpp
+++ b/src/variant_object.cpp
@@ -163,7 +163,6 @@ namespace fc
       return *this;
    }
 
-
    void to_variant( const variant_object& var,  variant& vo )
    {
       vo = variant(var);

From d1faea2bde66a605abf6e514803c3dc61f12d61b Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Thu, 12 Jan 2017 18:54:00 -0600
Subject: [PATCH 076/108] Revert incorrect start of boost compatibility update

---
 src/thread/context.hpp  | 42 +++++++----------------------------------
 src/thread/thread_d.hpp | 36 +++--------------------------------
 2 files changed, 10 insertions(+), 68 deletions(-)

diff --git a/src/thread/context.hpp b/src/thread/context.hpp
index 31bfbaa..f6e8a77 100644
--- a/src/thread/context.hpp
+++ b/src/thread/context.hpp
@@ -4,8 +4,6 @@
 #include <fc/exception/exception.hpp>
 #include <vector>
 
-#include <iostream>
-
 #include <boost/version.hpp>
 
 #if BOOST_VERSION >= 105400
@@ -45,17 +43,12 @@ namespace fc {
   struct context  {
     typedef fc::context* ptr;
 
-#if BOOST_VERSION >= 105400 // && BOOST_VERSION <= 106100 
+#if BOOST_VERSION >= 105400
     bco::stack_context stack_ctx;
 #endif
 
-#if BOOST_VERSION >= 106100 
-    typedef bc::detail::transfer_t transfer_t;
-#else
-    typedef intptr_t transfer_t;
-#endif
 
-    context( void (*sf)(transfer_t), stack_allocator& alloc, fc::thread* t )
+    context( void (*sf)(intptr_t), stack_allocator& alloc, fc::thread* t )
     : caller_context(0),
       stack_alloc(&alloc),
       next_blocked(0), 
@@ -70,13 +63,7 @@ namespace fc {
       cur_task(0),
       context_posted_num(0)
     {
-#if BOOST_VERSION >= 106100
-     //  std::cerr<< "HERE: "<< BOOST_VERSION <<"\n";
-     //my_context = new bc::execution_context<intptr_t>( [=]( bc::execution_context<intptr_t> sink, intptr_t self  ){ std::cerr<<"in ex\n"; sf(self);  std::cerr<<"exit ex\n"; return sink; } );
-     size_t stack_size = FC_CONTEXT_STACK_SIZE;
-     alloc.allocate(stack_ctx, stack_size);
-     my_context = bc::detail::make_fcontext( stack_ctx.sp, stack_ctx.size, sf );
-#elif BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 105600
      size_t stack_size = FC_CONTEXT_STACK_SIZE;
      alloc.allocate(stack_ctx, stack_size);
      my_context = bc::make_fcontext( stack_ctx.sp, stack_ctx.size, sf); 
@@ -97,7 +84,7 @@ namespace fc {
     }
 
     context( fc::thread* t) :
-#if BOOST_VERSION >= 105600 && BOOST_VERSION <= 106100 
+#if BOOST_VERSION >= 105600
      my_context(nullptr),
 #elif BOOST_VERSION >= 105300
      my_context(new bc::fcontext_t),
@@ -115,21 +102,10 @@ namespace fc {
      complete(false),
      cur_task(0),
      context_posted_num(0)
-    {
-    
-#if BOOST_VERSION >= 106100
-       /*
-        bc::execution_context<intptr_t> tmp(  [=]( bc::execution_context<intptr_t> sink, intptr_t ) { std::cerr<<"get current\n"; return sink; } );
-        auto result = tmp(0);
-        my_context = new bc::execution_context<intptr_t>( std::move( std::get<0>(result) ) );
-        */
-#endif
-    }
+    {}
 
     ~context() {
-#if BOOST_VERSION >= 106100
-      // delete my_context;
-#elif BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 105600
       if(stack_alloc)
         stack_alloc->deallocate( stack_ctx );
 #elif BOOST_VERSION >= 105400
@@ -233,11 +209,7 @@ namespace fc {
 
 
 
-
-#if BOOST_VERSION >= 106100 
-    //bc::execution_context<intptr_t>*   my_context;
-    bc::detail::fcontext_t       my_context;
-#elif BOOST_VERSION >= 105300 && BOOST_VERSION < 105600
+#if BOOST_VERSION >= 105300 && BOOST_VERSION < 105600
     bc::fcontext_t*              my_context;
 #else
     bc::fcontext_t               my_context;
diff --git a/src/thread/thread_d.hpp b/src/thread/thread_d.hpp
index 940a280..941b2fa 100644
--- a/src/thread/thread_d.hpp
+++ b/src/thread/thread_d.hpp
@@ -18,8 +18,6 @@ namespace fc {
     class thread_d {
 
         public:
-           fc::context* prev_ctx = nullptr;
-
            thread_d(fc::thread& s)
             :self(s), boost_thread(0),
              task_in_queue(0),
@@ -399,12 +397,7 @@ namespace fc {
                 }
                 // slog( "jump to %p from %p", next, prev );
                 // fc_dlog( logger::get("fc_context"), "from ${from} to ${to}", ( "from", int64_t(prev) )( "to", int64_t(next) ) ); 
-#if BOOST_VERSION >= 106100
-                prev_ctx = prev;
-                std::cerr<<"start jumping to existing context...\n";
-                bc::detail::jump_fcontext( next->my_context, this );
-                std::cerr<<"back from jumping to existing context\n";
-#elif BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 105600
                 bc::jump_fcontext( &prev->my_context, next->my_context, 0 );
 #elif BOOST_VERSION >= 105300
                 bc::jump_fcontext( prev->my_context, next->my_context, 0 );
@@ -446,16 +439,7 @@ namespace fc {
 
                 // slog( "jump to %p from %p", next, prev );
                 // fc_dlog( logger::get("fc_context"), "from ${from} to ${to}", ( "from", int64_t(prev) )( "to", int64_t(next) ) );
-#if BOOST_VERSION >= 106100
-                //(*next->my_context)( (intptr_t)this );
-                //bc::detail::transfer_t tran; tran.data = this;
-                std::cerr << "start prev->my_context = " << prev->my_context <<"... \n";
-                std::cerr << "jumping to next context... \n";
-                prev_ctx = prev;
-                auto result = bc::detail::jump_fcontext( next->my_context, this );
-                std::cerr << "end prev->my_context = " << prev->my_context <<"... \n";
-                std::cerr << result.fctx <<" <--- result \n";
-#elif BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 105600
                 bc::jump_fcontext( &prev->my_context, next->my_context, (intptr_t)this );
 #elif BOOST_VERSION >= 105300
                 bc::jump_fcontext( prev->my_context, next->my_context, (intptr_t)this );
@@ -483,22 +467,9 @@ namespace fc {
               return true;
            }
 
-           static void start_process_tasks( fc::context::transfer_t my ) 
+           static void start_process_tasks( intptr_t my ) 
            {
-#if BOOST_VERSION >= 106100
-              std::cerr<<"my data: "<<my.data<<"\n";
-              std::cerr<<"my from: "<<my.fctx<<"\n";
-              thread_d* self = (thread_d*)my.data;
-              if( self->prev_ctx )
-              {
-                 std::cerr << "setting prev_ctx to " << int64_t(my.fctx) << "\n";
-                 self->prev_ctx->my_context = my.fctx;
-              }
-              std::cerr<<"start process tasks\n" << int64_t(self)<<"\n";
-              assert( self != 0 );
-#else
               thread_d* self = (thread_d*)my;
-#endif
               try 
               {
                 self->process_tasks();
@@ -513,7 +484,6 @@ namespace fc {
               }
               self->free_list.push_back(self->current);
               self->start_next_fiber( false );
-              std::cerr << "existing start process tasks \n ";
            }
 
            void run_next_task() 

From 326140a9315970563c8a78834bad4ca2bb0d1fe2 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Thu, 12 Jan 2017 18:24:06 -0600
Subject: [PATCH 077/108] Remove leftover udt code

---
 .gitignore                         |  2 -
 include/fc/exception/exception.hpp |  2 -
 src/exception.cpp                  |  1 -
 tests/udt_client.cpp               | 36 -------------
 tests/udt_server.cpp               | 83 ------------------------------
 tests/udtc.cpp                     | 49 ------------------
 tests/udts.cpp                     | 39 --------------
 7 files changed, 212 deletions(-)
 delete mode 100644 tests/udt_client.cpp
 delete mode 100644 tests/udt_server.cpp
 delete mode 100644 tests/udtc.cpp
 delete mode 100644 tests/udts.cpp

diff --git a/.gitignore b/.gitignore
index 42cf923..5d3e633 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,5 +50,3 @@ GitSHA3.cpp
 
 ntp_test
 task_cancel_test
-udt_client
-udt_server
diff --git a/include/fc/exception/exception.hpp b/include/fc/exception/exception.hpp
index 0b10632..9fa7b54 100644
--- a/include/fc/exception/exception.hpp
+++ b/include/fc/exception/exception.hpp
@@ -32,7 +32,6 @@ namespace fc
        invalid_operation_exception_code  = 14,
        unknown_host_exception_code       = 15,
        null_optional_code                = 16,
-       udt_error_code                    = 17,
        aes_error_code                    = 18,
        overflow_code                     = 19,
        underflow_code                    = 20,
@@ -294,7 +293,6 @@ namespace fc
   FC_DECLARE_EXCEPTION( assert_exception, assert_exception_code, "Assert Exception" );
   FC_DECLARE_EXCEPTION( eof_exception, eof_exception_code, "End Of File" );
   FC_DECLARE_EXCEPTION( null_optional, null_optional_code, "null optional" );
-  FC_DECLARE_EXCEPTION( udt_exception, udt_error_code, "UDT error" );
   FC_DECLARE_EXCEPTION( aes_exception, aes_error_code, "AES error" );
   FC_DECLARE_EXCEPTION( overflow_exception, overflow_code, "Integer Overflow" );
   FC_DECLARE_EXCEPTION( underflow_exception, underflow_code, "Integer Underflow" );
diff --git a/src/exception.cpp b/src/exception.cpp
index fef482a..bbf9279 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -21,7 +21,6 @@ namespace fc
                            (eof_exception)
                            (unknown_host_exception)
                            (null_optional)
-                           (udt_exception)
                            (aes_exception)
                            (overflow_exception)
                            (underflow_exception)
diff --git a/tests/udt_client.cpp b/tests/udt_client.cpp
deleted file mode 100644
index f575b28..0000000
--- a/tests/udt_client.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-#include <iostream>
-#include <udt.h>
-#include <arpa/inet.h>
-
-using namespace std;
-using namespace UDT;
-
-int main()
-{
-   UDTSOCKET client = UDT::socket(AF_INET, SOCK_STREAM, 0);
-
-   sockaddr_in serv_addr;
-   serv_addr.sin_family = AF_INET;
-   serv_addr.sin_port = htons(9000);
-   inet_pton(AF_INET, "127.0.0.1", &serv_addr.sin_addr);
-
-   memset(&(serv_addr.sin_zero), '\0', 8);
-
-   // connect to the server, implict bind
-   if (UDT::ERROR == UDT::connect(client, (sockaddr*)&serv_addr, sizeof(serv_addr)))
-   {
-     cout << "connect: " << UDT::getlasterror().getErrorMessage();
-     return 0;
-   }
-
-   char* hello = "hello world! 3\n";
-   if (UDT::ERROR == UDT::send(client, hello, strlen(hello) + 1, 0))
-   {
-     cout << "send: " << UDT::getlasterror().getErrorMessage();
-     return 0;
-   }
-
-   UDT::close(client);
-
-   return 1;
-}
diff --git a/tests/udt_server.cpp b/tests/udt_server.cpp
deleted file mode 100644
index ff7e2fb..0000000
--- a/tests/udt_server.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <arpa/inet.h>
-#include <udt.h>
-#include <iostream>
-
-using namespace std;
-
-int main( int argc, char** argv )
-{
-   UDTSOCKET serv = UDT::socket(AF_INET, SOCK_STREAM, 0);
-   bool block = false;
-
-   sockaddr_in my_addr;
-   my_addr.sin_family = AF_INET;
-   my_addr.sin_port = htons(9000);
-   my_addr.sin_addr.s_addr = INADDR_ANY;
-   memset(&(my_addr.sin_zero), '\0', 8);
-
-   if (UDT::ERROR == UDT::bind(serv, (sockaddr*)&my_addr, sizeof(my_addr)))
-   {
-     cout << "bind: " << UDT::getlasterror().getErrorMessage();
-     return 0;
-   }
-   UDT::listen(serv, 10);
-
-   int namelen;
-   sockaddr_in their_addr;
-
-
-   UDT::setsockopt(serv, 0, UDT_SNDSYN, &block, sizeof(bool));
-   UDT::setsockopt(serv, 0, UDT_RCVSYN, &block, sizeof(bool));
-   UDTSOCKET recver = UDT::accept(serv, (sockaddr*)&their_addr, &namelen);
-   if( recver == UDT::INVALID_SOCK )
-   {
-      if( UDT::getlasterror_code() == CUDTException::EASYNCRCV )
-      {
-         std::cout << "nothing yet... better luck next time\n";
-      }
-   }
-   auto pollid = UDT::epoll_create();
-   UDT::epoll_add_usock(pollid, serv, nullptr );// const int* events = NULL);
-   std::set<UDTSOCKET> readready;
-   std::set<UDTSOCKET> writeready;
-   std::cout << "waiting for 5 seconds\n";
-   UDT::epoll_wait( pollid, &readready, &writeready, 10000 );
-   
-
-   recver = UDT::accept(serv, (sockaddr*)&their_addr, &namelen);
-   if( recver == UDT::INVALID_SOCK )
-   {
-      if( UDT::getlasterror_code() == CUDTException::EASYNCRCV )
-      {
-         std::cout << "nothing yet... better luck next time\n";
-      }
-      return 0;
-   }
-   UDT::setsockopt(recver, 0, UDT_SNDSYN, &block, sizeof(bool));
-   UDT::setsockopt(recver, 0, UDT_RCVSYN, &block, sizeof(bool));
-   UDT::epoll_remove_usock(pollid, serv );// const int* events = NULL);
-   int events = UDT_EPOLL_IN;
-
-   UDT::epoll_add_usock(pollid, recver, &events );// const int* events = NULL);
-
-   readready.clear();
-   UDT::epoll_wait( pollid, &readready, &writeready, 5000 );
-
-   char ip[16];
-   cout << "new connection: " << inet_ntoa(their_addr.sin_addr) << ":" << ntohs(their_addr.sin_port) << endl;
-
-   char data[100];
-
-   while (UDT::ERROR == UDT::recv(recver, data, 100, 0))
-   {
-     cout << "recv:" << UDT::getlasterror().getErrorMessage() << endl;
-     UDT::epoll_wait( pollid, &readready, &writeready, 5000 );
-   }
-
-   cout << data << endl;
-
-   UDT::close(recver);
-   UDT::close(serv);
-
-   return 1;
-}
diff --git a/tests/udtc.cpp b/tests/udtc.cpp
deleted file mode 100644
index aa48bb3..0000000
--- a/tests/udtc.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-#include <fc/network/udt_socket.hpp>
-#include <fc/network/ip.hpp>
-#include <fc/exception/exception.hpp>
-#include <fc/thread/thread.hpp>
-#include <iostream>
-#include <vector>
-
-using namespace fc;
-
-int main( int argc, char** argv )
-{
-   try {
-       udt_socket sock;
-       sock.bind( fc::ip::endpoint::from_string( "127.0.0.1:6666" ) );
-       ilog( "." );
-       sock.connect_to( fc::ip::endpoint::from_string( "127.0.0.1:7777" ) );
-       ilog( "after connect to..." );
-
-       std::cout << "local endpoint: " <<std::string( sock.local_endpoint() ) <<"\n";
-       std::cout << "remote endpoint: " <<std::string( sock.remote_endpoint() ) <<"\n";
-
-       std::string hello = "hello world\n";
-       for( uint32_t i = 0; i < 1000000; ++i )
-       {
-          sock.write( hello.c_str(), hello.size() );
-       }
-       ilog( "closing" );
-       sock.close();
-       usleep( fc::seconds(1) );
-       /*
-       std::vector<char> response;
-       response.resize(1024);
-       int r = sock.readsome( response.data(), response.size() );
-       while( r )
-       {
-          std::cout.write( response.data(), r );
-          r = sock.readsome( response.data(), response.size() );
-       }
-       */
-       // if we exit too quickly, UDT will not have a chance to
-       // send the graceful close message.
-       //fc::usleep( fc::seconds(1) );
-   } catch ( const fc::exception& e )
-   {
-      elog( "${e}", ("e",e.to_detail_string() ) );
-   }
-
-    return 0;
-}
diff --git a/tests/udts.cpp b/tests/udts.cpp
deleted file mode 100644
index 8b8d575..0000000
--- a/tests/udts.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#include <fc/network/udt_socket.hpp>
-#include <fc/network/ip.hpp>
-#include <fc/exception/exception.hpp>
-#include <iostream>
-#include <vector>
-
-using namespace fc;
-
-int main( int argc, char** argv )
-{
-   try {
-      udt_server serv;
-      serv.listen( fc::ip::endpoint::from_string( "127.0.0.1:7777" ) );
-
-      while( true )
-      {
-          udt_socket sock;
-          serv.accept( sock );
-
-          std::vector<char> response;
-          response.resize(1024);
-          int r = sock.readsome( response.data(), response.size() );
-          while( r )
-          {
-             std::cout.write( response.data(), r );
-             r = sock.readsome( response.data(), response.size() );
-             //sock.write( response.data(), response.size() );
-          }
-
-          std::string goodbye = "goodbye cruel world";
-          sock.write( goodbye.c_str(), goodbye.size() );
-      }
-   } catch ( const fc::exception& e )
-   {
-      elog( "${e}", ("e",e.to_detail_string() ) );
-   }
-
-   return 0;
-}

From 2b26a51b6c196409b3a31ac76e33aabee9c0ef9e Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Fri, 13 Jan 2017 14:29:22 -0600
Subject: [PATCH 078/108] Remove unused ssh code

---
 include/fc/ssh/client.hpp  | 193 ----------
 include/fc/ssh/error.hpp   |  25 --
 include/fc/ssh/process.hpp |  58 ---
 src/ssh/client.cpp         | 717 -------------------------------------
 src/ssh/client_impl.hpp    | 280 ---------------
 src/ssh/process.cpp        | 334 -----------------
 6 files changed, 1607 deletions(-)
 delete mode 100644 include/fc/ssh/client.hpp
 delete mode 100644 include/fc/ssh/error.hpp
 delete mode 100644 include/fc/ssh/process.hpp
 delete mode 100644 src/ssh/client.cpp
 delete mode 100644 src/ssh/client_impl.hpp
 delete mode 100644 src/ssh/process.cpp

diff --git a/include/fc/ssh/client.hpp b/include/fc/ssh/client.hpp
deleted file mode 100644
index eb24a8e..0000000
--- a/include/fc/ssh/client.hpp
+++ /dev/null
@@ -1,193 +0,0 @@
-#pragma once
-#include <memory>
-#include <functional>
-#include <fc/filesystem.hpp>
-
-namespace fc { 
-  class path;
-  class logger;
-  namespace ssh {
-  namespace detail {
-    class client_impl;
-    class process_impl;
-  };
-
-  enum sftp_file_type {
-    named_pipe = 0010000,
-    directory  = 0040000,
-    regular    = 0100000,
-    symlink    = 0120000
-  };
-
-
-  enum sftp_file_mode {
-    owner_mask    =    0000700,     /* RWX mask for owner */
-    owner_read    =    0000400,     /* R for owner */
-    owner_write   =    0000200,     /* W for owner */
-    owner_exec    =    0000100,     /* X for owner */
-    group_mask    =    0000070,     /* RWX mask for group */
-    group_read    =    0000040,     /* R for group */
-    group_write   =    0000020,     /* W for group */
-    group_exec    =    0000010,     /* X for group */
-    other_mask    =    0000007,     /* RWX mask for other */
-    other_read    =    0000004,     /* R for other */
-    other_write   =    0000002,     /* W for other */
-    other_exec    =    0000001      /* X for other */
-  };
-
-  struct file_attrib {
-    file_attrib();
-
-    uint64_t size;
-    uint32_t uid;
-    uint32_t gid;
-    uint32_t permissions;
-    uint32_t atime;
-    uint32_t mtime;
-
-    bool     exists();
-    bool     is_file();
-    bool     is_directory();
-  };
-
-
-  /**
-   *  @brief Enables communication over ssh using libssh2.
-   *
-   *  Because the client creates other resources that depend upon
-   *  it, it can only be created as a std::shared_ptr<client> (aka client::ptr) 
-   *  via client::create();
-   *
-   */
-  class client 
-  {
-    public:
-      enum trace_level {
-        TRACE_NONE      = 0,
-        TRACE_TRANS     = (1<<1),
-        TRACE_KEX       = (1<<2),
-        TRACE_AUTH      = (1<<3),
-        TRACE_CONN      = (1<<4),
-        TRACE_SCP       = (1<<5),
-        TRACE_SFTP      = (1<<6), 
-        TRACE_ERROR     = (1<<7),
-        TRACE_PUBLICKEY = (1<<8),
-        TRACE_SOCKET    = (1<<9)
-      };
-      /**
-       * Everything but TRACE_ERROR will be logged at fc::log_level::debug, while
-       * TRACE_ERROR will be logged at fc::log_level::error
-       *
-       * @param bitmask comprised of values from trace_level 
-       **/
-      void           set_trace_level( int bitmask );
-      int            get_trace_level()const;
-
-      /**
-       *  Override the default logger used by fc::ssh::client
-       */
-      void           set_logger( const logger& lgr );
-      const logger&  get_logger()const;
-
-      /** 
-       *  Connect, with no password specified.  Authentication will try public key, 
-       *  (via agent or explicitly-set key), empty password, then keyboard-interactive
-       */
-      void connect( const fc::string& user, const fc::string& host, uint16_t port = 22);
-
-      /**
-       *  Connect, specifying a password to be used for password authentication
-       */
-      void connect( const fc::string& user, const fc::string& pass, const fc::string& host, uint16_t port = 22);
-
-      /**
-       *  @note THIS METHOD IS DEPRECATED and should be replace with:
-       *
-       *  ssh::client_ptr sshc = std::make_shared<ssh::client>();
-       *  sshc->connect( ... )
-       *  ssh::process_ptr  proc = std::make_shared<ssh::process>( sshc );
-       *  proc->exec( ... )
-       *
-       *
-       *  @brief execute command on remote machine
-       *  @param pty_type - whether or not to request a PTY when executing this process, this is necessary 
-       *          for interactive (non-buffered) IO with the remote process, if left empty no pty will be 
-       *          requested
-       *
-       *  @note Processes launched in this manner will fully buffer stdin and stdout regardless of whether
-       *     the process calls flush().  If you need unbuffered (streaming, realtime) access to standard
-       *     out then you must launch the process via a shell.
-      ssh::process exec( const fc::string& cmd, const fc::string& pty_type = "" );
-       */
-
-
-      /**
-       *  @brief upload a file to remote host
-       *  @param progress a callback to report / cancel upload.  
-       *         The callback takes two parameters, bytes sent and file size.  To continue the 
-       *         transfer, the callback should return true.  To cancel the callback should return false.
-       */
-      void scp_send( const fc::path& local_path, const fc::path& remote_path, 
-                              std::function<bool(uint64_t,uint64_t)> progress = [](uint64_t,uint64_t){return true;} );
-
-      /**
-       *  @brief recursively sends the contents of local_dir to the remote_path
-       *
-       *  If remote_path ends in '/' then a new directory at <code>remote_path/local_dir.filename()</code> will 
-       *  be created, otherwise <code>local_dir / *</code> will be copied to <code>remote_path / *</code>
-       *
-       *  Progress will be reported as total bytes transferred for all files.
-       */
-      void scp_send_dir( const fc::path& local_dir, const fc::path& remote_path, 
-                              std::function<bool(uint64_t,uint64_t)> progress = [](uint64_t,uint64_t){return true;} );
-
-      /**
-       *  @pre remote_path is not a directory
-       *  @post remote file is removed from the remote filesystem
-       */
-      void rm( const fc::path& remote_path );
-
-      /**
-       *  @pre remote_path is a directory
-       *  @post remote directory is removed from the remote filesystem
-       */
-      void rmdir( const fc::path& remote_path );
-
-      void rmdir_recursive( const fc::path& remote_path );  
-
-      file_attrib stat( const fc::path& remote_path );
-
-      /**
-       *  @pre all parent directories already exist.
-       *  @pre remote_dir is not exist or is already a directory
-       *  @post remote_dir exists.
-       */
-      void mkdir( const fc::path& remote_dir, int mode = owner_read|owner_write|owner_exec );
-
-      /**
-       *  Create all parent directories for remote_dir if they do not exist.
-       *
-       *  @post remote_dir exists.
-       */
-      void create_directories( const fc::path& remote_dir, int mode = owner_read|owner_write|owner_exec );
-
-      /**
-       * Sets whether the remote system is believed to be a Windows box (by default, it's
-       * assumed to be running UNIX.  This alters how command-line arguments are quoted
-       * and possibly how filenames are altered when copying files
-       */
-      void set_remote_system_is_windows(bool is_windows = true);
-
-      void close();
-
-      client();
-      ~client();
-
-    private:
-      friend class process;
-      friend class detail::process_impl;
-      std::unique_ptr<detail::client_impl> my;
-  };
-  typedef std::shared_ptr<client> client_ptr;
-
-} } // namespace fc::ssh
diff --git a/include/fc/ssh/error.hpp b/include/fc/ssh/error.hpp
deleted file mode 100644
index 55eba7c..0000000
--- a/include/fc/ssh/error.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef MACE_SSH_ERROR_HPP
-#define MACE_SSH_ERROR_HPP
-#include <boost/exception/all.hpp>
-#include <boost/format.hpp>
-
-namespace mace { namespace ssh {
-typedef boost::error_info<struct err_msg_,std::string> err_msg;
-
-struct exception : public virtual boost::exception, public virtual std::exception {
-    const char* what()const throw()     { return "exception";                     }
-    virtual void       rethrow()const   { BOOST_THROW_EXCEPTION(*this);                  } 
-    const std::string& message()const   { return *boost::get_error_info<mace::ssh::err_msg>(*this); }
-};
-
-} } // mace::ssh
-
-/**
- *  Helper macro for throwing exceptions with a message:  THROW( "Hello World %1%, %2%", %"Hello" %"World" )
- */
-#define MACE_SSH_THROW( MSG, ... ) \
-  do { \
-    BOOST_THROW_EXCEPTION( mace::ssh::exception() << mace::ssh::err_msg( (boost::format( MSG ) __VA_ARGS__ ).str() ) );\
-  } while(0)
-
-#endif
diff --git a/include/fc/ssh/process.hpp b/include/fc/ssh/process.hpp
deleted file mode 100644
index 08eb089..0000000
--- a/include/fc/ssh/process.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-#include <fc/interprocess/iprocess.hpp>
-
-namespace fc { namespace ssh 
-{
-
-  class client;
-
-  namespace detail {
-    class process_impl;
-  };
-
-  /**
-   *  Enables communication with a process executed via 
-   *  client::exec().  
-   *
-   *  Process can only be created by mace::ssh::client.
-   */
-  class process  : public iprocess
-  {
-    public:
-      virtual iprocess& exec( const fc::path& exe, std::vector<std::string> args, 
-                              const fc::path& work_dir = fc::path(), exec_opts opts = open_all );
-
-      /**
-       *  Blocks until the result code of the process has been returned.
-       */
-      virtual int result();
-
-
-      /**
-       * Not supported.  libssh2 does not support sending signals to remote processes.
-       * closing in_stream() is the best you can do
-       */
-      virtual void kill();
-
-
-      /**
-       *  @brief returns a stream that writes to the process' stdin
-       */
-      virtual fc::buffered_ostream_ptr in_stream();
-      
-      /**
-       *  @brief returns a stream that reads from the process' stdout
-       */
-      virtual fc::buffered_istream_ptr out_stream();
-      /**
-       *  @brief returns a stream that reads from the process' stderr
-       */
-      virtual fc::buffered_istream_ptr err_stream();
-
-      process( fc::ssh::client_ptr c );
-      ~process();
-    private:
-      std::unique_ptr<detail::process_impl> my;
-  };
-
-} } // fc::ssh
diff --git a/src/ssh/client.cpp b/src/ssh/client.cpp
deleted file mode 100644
index 80d8788..0000000
--- a/src/ssh/client.cpp
+++ /dev/null
@@ -1,717 +0,0 @@
-#define NOMINMAX // prevent windows from defining min and max macros
-#include <libssh2.h>
-#include <libssh2_sftp.h>
-
-#include <memory>
-
-#include <boost/filesystem.hpp>
-#include <boost/asio.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-
-#include <fc/filesystem.hpp>
-#include <fc/ssh/client.hpp>
-#include <fc/ssh/process.hpp>
-#include <fc/time.hpp>
-#include <fc/io/iostream.hpp>
-#include <fc/thread/thread.hpp>
-#include <fc/vector.hpp>
-#include <fc/interprocess/file_mapping.hpp>
-#include <fc/thread/unique_lock.hpp>
-#include <fc/asio.hpp>
-
-#include "client_impl.hpp"
-
-namespace fc { namespace ssh {
-  
-  namespace detail {
-    static int ssh_init = libssh2_init(0);
-  }
-
-  client::client():my( new detail::client_impl() ){ (void)detail::ssh_init; /* fix unused warning...*/ }
-  client::~client() { my->close(); }
-
-  void client::set_trace_level( int bitmask ) { my->_trace_level = bitmask; }
-  int  client::get_trace_level()const         { return my->_trace_level;    }
-  const logger& client::get_logger()const     { return my->logr;           }
-  void client::set_logger( const logger& l )  { my->logr = l;               }
-
-  void client::connect( const fc::string& user, const fc::string& host, uint16_t port ) {
-       my->hostname = host;
-       my->uname    = user;
-       my->port     = port;
-       my->connect();
-  }
-  void client::connect( const fc::string& user, const fc::string& pass, 
-                        const fc::string& host, uint16_t port  ) {
-       my->hostname = host;
-       my->uname    = user;
-       my->upass    = pass;
-       my->port     = port;
-
-       my->connect();
-  }
-
-  void client::close() { my->close(); }
-
-
-//  ssh::process client::exec( const fc::string& cmd, const fc::string& pty_type  ) {
-//    return ssh::process( *this, cmd, pty_type ); 
-//  }
-
-  /**
-   *  @todo implement progress reporting.
-   */
-  void client::scp_send_dir( const fc::path& local_dir, const fc::path& remote_path, 
-                              std::function<bool(uint64_t,uint64_t)> progress )
-  {
-      fc::path remote_dir = remote_path;
-      if( remote_dir.filename() == fc::path(".") ) 
-         remote_dir /= local_dir.filename();
-
-      fc_dlog( my->logr, "scp -r ${local} ${remote}", ("local",local_dir)("remote",remote_dir) );
-      create_directories( remote_dir );
-
-      directory_iterator ditr(local_dir);
-      directory_iterator dend;
-
-      while( ditr != dend ) {
-          if( (*ditr).filename() == "."  ||
-              (*ditr).filename() == ".." )
-          { } 
-          else if( fc::is_directory(*ditr) )
-          {
-             scp_send_dir( (*ditr), remote_dir / (*ditr).filename() );
-          } else if( fc::is_regular_file(*ditr) ) {
-             scp_send( *ditr, remote_dir / (*ditr).filename() );
-          } else {
-             fc_wlog( my->logr, "Skipping '${path}", ("path",fc::canonical(*ditr)) );
-          }
-          ++ditr;
-      }
-  }
-
-  void client::scp_send( const fc::path& local_path, const fc::path& remote_path, 
-                        std::function<bool(uint64_t,uint64_t)> progress ) {
-    fc_wlog( my->logr, "scp ${local} ${remote}", ("local",local_path)("remote",remote_path ) );
-    if( !fc::exists(local_path) ) {
-      FC_THROW( "Source file '${file}' does not exist", ("file",local_path) ) ;
-    }
-    if( is_directory( local_path ) ) {
-      FC_THROW( "Source file '${file}' is a directory, expected a file", ("file",local_path) ) ;
-    }
-
-    // memory map the file
-    uint64_t fsize = file_size(local_path);
-    if( fsize == 0 ) {
-        elog( "file size ${file_size}", ("file_size", fsize) );
-        // TODO: handle empty file case
-        if( progress ) progress(0,0);
-        return;
-    }
-    file_mapping fmap( local_path.string().c_str(), read_only );
-
-    LIBSSH2_CHANNEL*                      chan = 0;
-    time_t now;
-    memset( &now, 0, sizeof(now) );
-
-    // TODO: preserve creation / modification date
-    // TODO: perserve permissions / exec bit?
-    try {
-      // libssh2_scp_send64 stores state data in the session object, and it calls channel_open which 
-      // stores its own state data, so lock both.
-      fc::scoped_lock<fc::mutex> channel_open_lock(my->channel_open_mutex);
-      fc::scoped_lock<fc::mutex> scp_send_lock(my->scp_send_mutex);
-      chan = my->call_ssh2_ptr_function_throw<LIBSSH2_CHANNEL*>(boost::bind(libssh2_scp_send64, my->session, remote_path.generic_string().c_str(), 0700, fsize, now, now ));
-    } catch (fc::exception& er) {
-      FC_RETHROW_EXCEPTION(er, error, "scp ${local_file} to ${remote_file} failed", ("local_file", local_path)("remote_file",remote_path));
-    }
-    uint64_t total_bytes_written = 0;
-    try {
-      const size_t max_mapping_size = 1024*1024*1024; // 1GB
-      for (uint64_t current_offset = 0; current_offset < fsize; current_offset += max_mapping_size) {
-        uint64_t total_bytes_left_to_send = fsize - current_offset;
-        size_t bytes_to_send_this_iteration = (size_t)std::min<uint64_t>(total_bytes_left_to_send, max_mapping_size);
-        mapped_region mr( fmap, fc::read_only, current_offset, bytes_to_send_this_iteration);
-        size_t bytes_written_this_iteration = 0;
-        char* pos = reinterpret_cast<char*>(mr.get_address());
-        while( progress(total_bytes_written, fsize) && bytes_written_this_iteration < bytes_to_send_this_iteration) {
-            int r = my->call_ssh2_function_throw(boost::bind(libssh2_channel_write_ex, chan, 0, pos, 
-                                                             bytes_to_send_this_iteration - bytes_written_this_iteration),
-					         "scp failed ${code} - ${message}");
-            bytes_written_this_iteration += r;
-            total_bytes_written += r;
-            pos   += r;
-	    // fc_wlog( my->logr, "wrote ${bytes} bytes", ("bytes",r) );
-        }
-      }
-      my->call_ssh2_function(boost::bind(libssh2_channel_send_eof, chan));
-      my->call_ssh2_function(boost::bind(libssh2_channel_wait_eof, chan));
-      my->call_ssh2_function(boost::bind(libssh2_channel_close, chan));
-    } catch ( fc::exception& er ) {
-      // clean up chan
-      my->call_ssh2_function(boost::bind(libssh2_channel_free, chan));
-      throw er;
-    }
-    my->call_ssh2_function_throw(boost::bind(libssh2_channel_free, chan),
-				 "scp failed ${code} - ${message}");
-  }
-
-
-  void client::rm( const fc::path& remote_path ) {
-    try {
-       auto s = stat(remote_path);
-       if( s.is_directory() ) {
-         FC_THROW( "sftp cannot remove directory ${path}", ("path",remote_path) );
-       }
-       else if( !s.exists() ) {
-         return; // nothing to do
-       }
-
-       {
-         fc::scoped_lock<fc::mutex> scp_unlink_lock(my->scp_unlink_mutex);
-         my->call_ssh2_function_throw(boost::bind(libssh2_sftp_unlink_ex, my->sftp, remote_path.generic_string().c_str(), remote_path.generic_string().size()),
-                                      "sftp rm failed ${code}");
-       }
-     } catch ( fc::exception& er ) {
-         FC_RETHROW_EXCEPTION( er, error, "sftp remove '${remote_path}' failed", ("remote_path",remote_path) );
-     }
-  }
-
-  void client::rmdir( const fc::path& remote_path ) {
-    try {
-       auto s = stat(remote_path);
-       if( !s.is_directory() )
-         FC_THROW( "sftp cannot rmdir non-directory ${path}", ("path",remote_path) );
-       else if( !s.exists() )
-         return; // nothing to do
-
-       {
-         fc::scoped_lock<fc::mutex> scp_rmdir_lock(my->scp_rmdir_mutex);
-         my->call_ssh2_function_throw(boost::bind(libssh2_sftp_rmdir_ex, my->sftp, remote_path.generic_string().c_str(), remote_path.generic_string().size()),
-                                      "sftp rmdir failed ${code}");
-       }
-     } catch ( fc::exception& er ) {
-       FC_RETHROW_EXCEPTION( er, error, "sftp rmdir '${remote_path}' failed", ("remote_path",remote_path) );
-     }
-  }
-
-  void client::rmdir_recursive( const fc::path& remote_path ) {
-    try {
-      auto s = stat(remote_path);
-      if( !s.is_directory() )
-        FC_THROW( "sftp cannot rmdir non-directory ${path}", ("path",remote_path) );
-      else if( !s.exists() )
-        return; // nothing to do
-
-      LIBSSH2_SFTP_HANDLE *dir_handle;
-      {
-        fc::scoped_lock<fc::mutex> scp_open_lock(my->scp_open_mutex);
-        dir_handle = 
-          my->call_ssh2_ptr_function_throw<LIBSSH2_SFTP_HANDLE*>(boost::bind(libssh2_sftp_open_ex, my->sftp, remote_path.generic_string().c_str(), remote_path.generic_string().size(), 0, 0, LIBSSH2_SFTP_OPENDIR),
-                                                                             "sftp libssh2_sftp_opendir failed ${code}");
-      }
-      do {
-        char mem[512];
-        LIBSSH2_SFTP_ATTRIBUTES attrs;
-
-        int rc;
-        {
-          fc::scoped_lock<fc::mutex> scp_readdir_lock(my->scp_readdir_mutex);
-          rc = my->call_ssh2_function_throw(boost::bind(libssh2_sftp_readdir_ex, dir_handle, mem, sizeof(mem), (char*)NULL, 0, &attrs),
-                                            "sftp readdir failed ${code}");
-        }
-        if (rc > 0) {
-          fc::string file_or_dir_name(mem, rc);
-          if (file_or_dir_name == "." || file_or_dir_name == "..")
-            continue;
-          fc::path full_remote_path = remote_path / file_or_dir_name;
-          if (LIBSSH2_SFTP_S_ISDIR(attrs.permissions))
-            rmdir_recursive(full_remote_path);
-          else if (LIBSSH2_SFTP_S_ISREG(attrs.permissions)) {
-            fc::scoped_lock<fc::mutex> scp_unlink_lock(my->scp_unlink_mutex);
-            my->call_ssh2_function_throw(boost::bind(libssh2_sftp_unlink_ex, my->sftp, full_remote_path.generic_string().c_str(), full_remote_path.generic_string().size()),
-                                         "sftp rm failed ${code}");
-          }
-        } else
-          break;
-      } while (1);
-
-      {
-        fc::scoped_lock<fc::mutex> scp_close_lock(my->scp_close_mutex);
-        my->call_ssh2_function_throw(boost::bind(libssh2_sftp_close_handle, dir_handle), "sftp libssh2_sftp_closedir failed ${code}");
-      }
-      {
-        fc::scoped_lock<fc::mutex> scp_rmdir_lock(my->scp_rmdir_mutex);
-        my->call_ssh2_function_throw(boost::bind(libssh2_sftp_rmdir_ex, my->sftp, remote_path.generic_string().c_str(), remote_path.generic_string().size()),
-                                                 "sftp rmdir failed ${code}");
-      }
-    } catch ( fc::exception& er ) {
-      FC_RETHROW_EXCEPTION( er, error, "sftp rmdir recursive '${remote_path}' failed", ("remote_path",remote_path) );
-    }
-  }
-
-  file_attrib client::stat( const fc::path& remote_path ){
-     my->init_sftp();
-     LIBSSH2_SFTP_ATTRIBUTES att;
-     int ec;
-     {
-       fc::scoped_lock<fc::mutex> scp_stat_lock(my->scp_stat_mutex);
-       ec = my->call_ssh2_function(boost::bind(libssh2_sftp_stat_ex, my->sftp, 
-					       remote_path.generic_string().c_str(), remote_path.generic_string().size(), 
-					       LIBSSH2_SFTP_STAT, &att));
-     }
-     if( ec )
-        return file_attrib();
-     file_attrib    ft;
-     ft.size        = att.filesize;
-     ft.permissions = att.permissions;
-     return ft;
-  }
-  void client::create_directories( const fc::path& rdir, int mode ) {
-     boost::filesystem::path dir = rdir;
-     boost::filesystem::path p;
-     auto pitr = dir.begin();
-     while( pitr != dir.end() ) {
-       p /= *pitr;
-       if( !stat( p ).exists() ) {
-         mkdir(p,mode);
-       } 
-       ++pitr;
-     }
-  }
-
-  void client::mkdir( const fc::path& rdir, int mode ) {
-     try {
-       auto s = stat(rdir);
-       if( s.is_directory() ) 
-         return;
-       else if( s.exists() )
-         FC_THROW( "File already exists at path ${path}", ("path",rdir) );
-       
-       {
-         fc::scoped_lock<fc::mutex> scp_mkdir_lock(my->scp_mkdir_mutex);
-         my->call_ssh2_function_throw(boost::bind(libssh2_sftp_mkdir_ex, my->sftp, 
-                                                  rdir.generic_string().c_str(), rdir.generic_string().size(), mode), 
-                                      "sftp mkdir error");
-       }
-     } catch ( fc::exception& er ) {
-          FC_RETHROW_EXCEPTION( er, error, "sftp failed to create directory '${directory}'", ( "directory", rdir ) );
-     }
-  }
-
-   void client::set_remote_system_is_windows(bool is_windows /* = true */) {
-      my->remote_system_is_windows = is_windows;
-   }
-
-
-  file_attrib::file_attrib()
-  :size(0),uid(0),gid(0),permissions(0),atime(0),mtime(0)
-  { }
-
-  bool file_attrib::is_directory() {
-    return  LIBSSH2_SFTP_S_ISDIR(permissions);
-  }
-  bool file_attrib::is_file() {
-    return LIBSSH2_SFTP_S_ISREG(permissions);
-  }
-  bool file_attrib::exists() {
-    return 0 != permissions;
-  }
-  
-  detail::client_impl::client_impl() :
-    session(nullptr),
-    knownhosts(nullptr),
-    sftp(nullptr),
-    agent(nullptr),
-    _trace_level(0), // was  LIBSSH2_TRACE_ERROR 
-    logr(fc::logger::get( "fc::ssh::client" )),
-    remote_system_is_windows(false) {
-    logr.set_parent( fc::logger::get( "default" ) );
-  }
-
-  detail::client_impl::~client_impl() {
-    close();
-  }
-
-  /* static */ 
-  void detail::client_impl::kbd_callback(const char *name, int name_len, 
-                                  const char *instruction, int instruction_len, int num_prompts,
-                                  const LIBSSH2_USERAUTH_KBDINT_PROMPT *prompts,
-                                  LIBSSH2_USERAUTH_KBDINT_RESPONSE *responses,
-                                  void **abstract) {
-    detail::client_impl* self = (client_impl*)*abstract;
-        
-        
-    for (int i = 0; i < num_prompts; i++) {
-      fwrite(prompts[i].text, 1, prompts[i].length, stdout);
-        
-      if( self->upass.size() == 0 ) {
-       /** TODO: add keyboard callback here... 
-        fgets(buf, sizeof(buf), stdin);
-        n = strlen(buf);
-        while (n > 0 && strchr("\r\n", buf[n - 1]))
-          n--;
-        buf[n] = 0;
-        
-#ifdef WIN32 // fix warning
-# define strdup _strdup
-#endif
-        responses[i].text = strdup(buf);
-        responses[i].length = n;
-        */
-        responses[i].text = nullptr;
-        responses[i].length = 0;
-      } else {
-        responses[i].text = strdup(self->upass.c_str());
-        responses[i].length = self->upass.size();
-      }        
-    }        
-  }
-
-  void detail::client_impl::connect() {
-    try {
-      if( libssh2_init(0) < 0  )
-        FC_THROW( "Unable to init libssh2" );
-            
-      auto eps = fc::asio::tcp::resolve( hostname, boost::lexical_cast<std::string>(port) );
-      if( eps.size() == 0 )
-        FC_THROW( "Unable to resolve host '${host}'", ("host",hostname) );
-
-      sock.reset( new boost::asio::ip::tcp::socket( fc::asio::default_io_service() ) );
-            
-      bool resolved = false;
-      for( uint32_t i = 0; i < eps.size(); ++i ) {
-        std::stringstream ss; ss << eps[i];
-        try {
-          boost::system::error_code ec;
-          fc_ilog( logr, "Attempting to connect to ${endpoint}", ("endpoint",ss.str().c_str()) );
-          fc::asio::tcp::connect( *sock, eps[i] );
-          endpt = eps[i];
-          resolved = true;
-          break;
-        } catch ( fc::exception& er ) {
-          fc_ilog( logr, "Failed to connect to ${endpoint}\n${error_reprot}", 
-                    ("endpoint",ss.str().c_str())("error_report", er.to_detail_string()) );
-          sock->close();
-        }
-      }
-      if( !resolved )
-        FC_THROW( "Unable to connect to any resolved endpoint for ${host}:${port}", 
-                  ("host", hostname).set("port",port) );
-
-      session = libssh2_session_init(); 
-      libssh2_trace( session, _trace_level );
-      libssh2_trace_sethandler( session, this, client_impl::handle_trace );
-
-      *libssh2_session_abstract(session) = this;
-            
-      libssh2_session_set_blocking( session, 0 );
-      try {
-        call_ssh2_function_throw(boost::bind(libssh2_session_handshake, session, sock->native()),
-                                 "SSH Handshake error: ${code} - ${message}");
-      } catch (fc::exception& er) {
-        FC_RETHROW_EXCEPTION( er, error, "Error during SSH handshake" );;
-      }
-      //const char* fingerprint = libssh2_hostkey_hash(session, LIBSSH2_HOSTKEY_HASH_SHA1);
-      //slog( "fingerprint: %s", fingerprint );
-             
-      // try to authenticate, throw on error.
-      try {
-        authenticate();
-      } catch (fc::exception& er) {
-        FC_RETHROW_EXCEPTION( er, error, "Error during SSH authentication" );;
-      }
-      //slog(".");
-    } catch ( fc::exception& er ) {
-      elog( "Unable to connect to ssh server: ${detail}", ("detail", er.to_detail_string().c_str()) );
-      close();
-      FC_RETHROW_EXCEPTION( er, error, "Unable to connect to ssh server" );;
-    } catch ( ... ) {
-      close();
-      FC_THROW( "Unable to connect to ssh server", ("exception", fc::except_str() ) );
-    }
-  }
-
-  /* static */
-  void detail::client_impl::handle_trace( LIBSSH2_SESSION* session, void* context, const char* data, size_t length ) {
-    client_impl* my = (client_impl*)context;
-    fc::string str(data,length);
-    fc_wlog( my->logr, "${message}", ("message",str) );
-  }
-
-  void detail::client_impl::close() {
-    if( session ) {
-      if( sftp ) {
-        try {
-	  call_ssh2_function(boost::bind(libssh2_sftp_shutdown, sftp));
-        }catch(...){
-	  fc_wlog( logr, "caught closing sftp session" );
-        }
-        sftp = 0;
-      }
-
-      if (agent) {
-        libssh2_agent_disconnect(agent);
-        libssh2_agent_free(agent);
-        agent = nullptr;
-      }
-
-      try {
-        call_ssh2_function(boost::bind(libssh2_session_disconnect_ex, session, SSH_DISCONNECT_BY_APPLICATION, "exit cleanly", ""));
-        call_ssh2_function(boost::bind(libssh2_session_free, session), false);
-      } catch ( ... ){
-        fc_wlog( logr, "caught freeing session" );
-      }
-      session = 0;
-      try {
-        if( sock )
-          sock->close();
-      } catch ( ... ){
-        fc_wlog( logr, "caught error closing socket" );
-      }
-      sock.reset(0);
-      try {
-        if( read_prom )
-          read_prom->wait();
-      } catch ( ... ){
-        fc_wlog( logr, "caught error waiting on read" );
-      }
-      try {
-        if( write_prom )
-          write_prom->wait();
-      } catch ( ... ){
-        fc_wlog( logr, "caught error waiting on write" );
-      }
-    }
-  }
-
-  void detail::client_impl::authenticate() {
-    try {
-      char * alist = NULL;
-      // libssh2_userauth_list has strange enough behavior that we can't use the 
-      // call_blocking_libssh2_function-type functions to wait and retry, so we must
-      // explicitly lock around the libssh2_userauth_list calls.  
-      // hence, this anonymous scope:
-        {
-        fc::unique_lock<fc::mutex> lock(ssh_session_mutex);
-
-        alist = libssh2_userauth_list(session, uname.c_str(),uname.size());
-
-        if(alist==NULL) {
-          char * msg   = 0;
-          int    ec    = 0;
-          if(libssh2_userauth_authenticated(session))
-            return; // CONNECTED!
-          ec = libssh2_session_last_error(session,&msg,NULL,0);
-
-          while( !alist && (ec == LIBSSH2_ERROR_EAGAIN) ) {
-            wait_on_socket();
-            alist = libssh2_userauth_list(session, uname.c_str(), uname.size());
-            ec = libssh2_session_last_error(session,&msg,NULL,0);
-          }
-          if( !alist ) {
-            FC_THROW( "Error getting authorization list: ${code} - ${message}", 
-                              ("code",ec).set("message",msg));
-          }
-        }
-      } // end anonymous scope
-
-    std::vector<std::string> split_alist;
-    bool pubkey = false;
-    bool pass   = false;
-    bool keybd   = false;
-    boost::split( split_alist, alist, boost::is_any_of(",") );
-    std::for_each( split_alist.begin(), split_alist.end(), [&](const std::string& s){
-      if( s == "publickey" )
-        pubkey = true;
-      else if( s == "password" )
-        pass = true;
-      else if( s == "keyboard-interactive" )
-        keybd = true;
-      else
-        fc_dlog( logr, "Unknown/unsupported authentication type '${auth_type}'", ("auth_type",s.c_str()));
-    });
-
-    if( pubkey && try_pub_key() ) 
-      return;
-    if( pass && try_pass() )
-      return;
-    if( keybd && try_keyboard() )
-      return;
-    } catch ( fc::exception& er ) {
-      FC_RETHROW_EXCEPTION( er, error, "Unable to authenticate ssh connection" );
-    }
-    FC_THROW( "Unable to authenticate ssh connection" );
-  } // authenticate()
-
-  bool detail::client_impl::try_pass() {
-    return !call_ssh2_function(boost::bind(libssh2_userauth_password_ex, session, uname.c_str(), uname.size(), 
-					    upass.c_str(), upass.size(), (LIBSSH2_PASSWD_CHANGEREQ_FUNC((*)))NULL));
-  }
-  bool detail::client_impl::try_keyboard() {
-    return !call_ssh2_function(boost::bind(libssh2_userauth_keyboard_interactive_ex, session, 
-                                            uname.c_str(), uname.size(), &client_impl::kbd_callback));
-  }
-  bool detail::client_impl::try_pub_key() {
-    if (privkey.size()) {
-      if (!call_ssh2_function(boost::bind(libssh2_userauth_publickey_fromfile_ex,
-					  session,
-					  uname.c_str(), uname.size(),
-					  pubkey.c_str(),
-					  privkey.c_str(),
-					  passphrase.c_str())))
-        return true; // successful authentication from file
-      fc_ilog( logr, "failed to authenticate with private key from file '${privkey_filename}'", ("privkey_filename",privkey));
-    } else
-      fc_ilog( logr, "no private key file set, skiping pubkey authorization from file");
-
-    agent = libssh2_agent_init(session);
-    if (!agent) {
-      fc_wlog( logr, "failed to initialize ssh-agent support");
-      return false;
-    }
-
-    if (call_ssh2_function(boost::bind(libssh2_agent_connect, agent))) {
-      fc_ilog( logr, "failed to connect to ssh-agent");
-      return false;
-    }
-
-    if (call_ssh2_function(boost::bind(libssh2_agent_list_identities, agent))) {
-      fc_ilog( logr, "failed requesting identities from ssh-agent");
-      return false;
-    }
-
-    struct libssh2_agent_publickey *prev_identity = NULL;
-    while (1) {
-      struct libssh2_agent_publickey *identity;
-      int ec = call_ssh2_function(boost::bind(libssh2_agent_get_identity, agent, &identity, prev_identity));
-      if (ec == 1)
-        break; // done iterating over keys
-      if (ec < 0) {
-        fc_ilog( logr, "failed obtaining identity from ssh-agent");
-        return false;
-      }
-
-      if (call_ssh2_function(boost::bind(libssh2_agent_userauth, agent, uname.c_str(), identity)))
-        fc_ilog( logr, "unable to authenticate with public key '${key_comment}'", ("key_comment",identity->comment));
-      else {
-        fc_ilog( logr, "authenticated with public key '${key_comment}'", ("key_comment",identity->comment));
-        return true;
-      }
-      prev_identity = identity;
-    }
-    return false;
-  }
-
-  void detail::client_impl::wait_on_socket(int additionalDirections /* = 0 */) {
-    int dir = libssh2_session_block_directions(session);
-    dir |= additionalDirections;
-    if( !dir ) 
-      return;
-
-    fc::promise<boost::system::error_code>::ptr rprom, wprom;
-    if( dir & LIBSSH2_SESSION_BLOCK_INBOUND ) {
-      fc::scoped_lock<fc::spin_lock> lock(this->_spin_lock);
-      if( !read_prom ) {
-        read_prom.reset( new fc::promise<boost::system::error_code>("read_prom") );
-        sock->async_read_some( boost::asio::null_buffers(),
-                                [=]( const boost::system::error_code& e, size_t  ) {
-                                  fc::scoped_lock<fc::spin_lock> lock(this->_spin_lock);
-                                  this->read_prom->set_value(e);
-                                  this->read_prom.reset(nullptr);
-                                } );
-      }
-      rprom = read_prom;
-    }
-          
-    if( dir & LIBSSH2_SESSION_BLOCK_OUTBOUND ) {
-      fc::scoped_lock<fc::spin_lock> lock(this->_spin_lock);
-      if( !write_prom ) {
-          write_prom.reset( new fc::promise<boost::system::error_code>("write_prom") );
-          sock->async_write_some( boost::asio::null_buffers(),
-                                  [=]( const boost::system::error_code& e, size_t  ) {
-                                    fc::scoped_lock<fc::spin_lock> lock(this->_spin_lock);
-                                    this->write_prom->set_value(e);
-                                    this->write_prom.reset(0);
-                                  } );
-      }
-      wprom = write_prom;
-    }
-
-    boost::system::error_code ec;
-    if( rprom.get() && wprom.get() ) {
-      typedef fc::future<boost::system::error_code> fprom;
-      fprom fw(wprom);
-      fprom fr(rprom);
-#if 0
-      // EMF: at present there are known bugs in fc::wait_any, and it will fail to wake up
-      // when one of the futures is ready.  
-      int r = fc::wait_any( fw, fr, fc::seconds(1) );
-#else
-      int r;
-      while (1) {
-        if (fw.ready()) {
-          r = 0; break;
-        }
-        if (fr.ready()) {
-          r = 1; break;
-        }
-        fc::usleep(fc::microseconds(5000));
-      }
-#endif
-      switch( r ) {
-        case 0:
-          if( wprom->wait() ) { 
-            FC_THROW( "Socket Error ${message}", 
-                              ( "message", boost::system::system_error(rprom->wait() ).what() ) ); 
-          }
-          break;
-        case 1:
-          if( rprom->wait() ) { 
-            FC_THROW( "Socket Error ${message}", 
-                              ( "message", boost::system::system_error(rprom->wait() ).what() ) ); 
-          }
-          break;
-      }
-    } else if( rprom ) {
-        if( rprom->wait() ) { 
-          FC_THROW( "Socket Error ${message}", 
-                            ( "message", boost::system::system_error(rprom->wait() ).what() ) ); 
-        }
-    } else if( wprom ) {
-        if( wprom->wait() ) { 
-          FC_THROW( "Socket Error ${message}", 
-                            ( "message", boost::system::system_error(wprom->wait() ).what() ) ); 
-        }
-    }
-  }
-  void detail::client_impl::init_sftp() {
-    if( !sftp )
-      sftp = call_ssh2_ptr_function_throw<LIBSSH2_SFTP*>(boost::bind(libssh2_sftp_init,session),
-                                                          "init sftp error ${code} - ${message}");
-  }
-
-
-  LIBSSH2_CHANNEL* detail::client_impl::open_channel( const fc::string& pty_type ) {
-    LIBSSH2_CHANNEL*                      chan = 0;
-    /* anonymous scope */ {
-      fc::scoped_lock<fc::mutex> channel_open_lock(channel_open_mutex);
-
-      chan = call_ssh2_ptr_function_throw<LIBSSH2_CHANNEL*>(boost::bind(libssh2_channel_open_ex, session,
-								        "session", sizeof("session") - 1,
-								        LIBSSH2_CHANNEL_WINDOW_DEFAULT,
-								        LIBSSH2_CHANNEL_PACKET_DEFAULT, 
-								        (const char*)NULL, 0),
-							    "libssh2_channel_open_session failed: ${message}");
-    }
-
-    if( pty_type.size() )
-      call_ssh2_function_throw(boost::bind(libssh2_channel_request_pty_ex, chan, pty_type.c_str(), pty_type.size(),
-					    (char *)NULL, 0, LIBSSH2_TERM_WIDTH, LIBSSH2_TERM_HEIGHT, 
-					    LIBSSH2_TERM_WIDTH_PX, LIBSSH2_TERM_HEIGHT_PX),
-				"libssh2_channel_req_pty failed: ${message}");
-    return chan;
-  }
-
-} }
diff --git a/src/ssh/client_impl.hpp b/src/ssh/client_impl.hpp
deleted file mode 100644
index 606bd36..0000000
--- a/src/ssh/client_impl.hpp
+++ /dev/null
@@ -1,280 +0,0 @@
-#define NOMINMAX
-#include <libssh2.h>
-#include <libssh2_sftp.h>
-
-#include <boost/asio.hpp>
-
-#include <fc/ssh/client.hpp>
-#include <fc/ssh/process.hpp>
-#include <fc/thread/mutex.hpp>
-#include <fc/thread/spin_lock.hpp>
-#include <fc/thread/scoped_lock.hpp>
-#include <fc/log/logger.hpp>
-
-#include <fc/asio.hpp>
-
-// include this to get acess to the details of the LIBSSH2_SESSION structure, so
-// we can verify that all data has really been sent when libssh2 says it has.
-#include <../src/libssh2_priv.h>
-
-namespace fc { namespace ssh {
-  
-  namespace detail {
-
-    class client_impl {
-      public:
-        client_impl();
-        ~client_impl();
-
-        LIBSSH2_SESSION*            session;
-        LIBSSH2_KNOWNHOSTS*         knownhosts;
-        LIBSSH2_SFTP*               sftp;
-        LIBSSH2_AGENT*              agent;
-
-        std::unique_ptr<boost::asio::ip::tcp::socket> sock;
-        boost::asio::ip::tcp::endpoint                endpt;
-
-        fc::mutex                   ssh_session_mutex;
-        fc::mutex                   channel_open_mutex;
-        fc::mutex                   process_startup_mutex;
-        fc::mutex                   scp_send_mutex;
-        fc::mutex                   scp_stat_mutex;
-        fc::mutex                   scp_mkdir_mutex;
-        fc::mutex                   scp_rmdir_mutex;
-        fc::mutex                   scp_unlink_mutex;
-        fc::mutex                   scp_close_mutex;
-        fc::mutex                   scp_readdir_mutex;
-        fc::mutex                   scp_open_mutex;
-
-        fc::string                  uname;
-        fc::string                  upass;
-        fc::string                  pubkey;
-        fc::string                  privkey;
-        fc::string                  passphrase;
-        fc::string                  hostname;
-        uint16_t                    port;
-        bool                        session_connected;
-        fc::promise<boost::system::error_code>::ptr      read_prom;
-        fc::promise<boost::system::error_code>::ptr      write_prom;
-        fc::spin_lock                                    _spin_lock;
-        int    _trace_level;
-        logger logr;
-
-        bool                        remote_system_is_windows; // true if windows, false if unix, used for command-line quoting and maybe filename translation
-
-        LIBSSH2_CHANNEL*   open_channel( const fc::string& pty_type );
-        static void kbd_callback(const char *name, int name_len, 
-                     const char *instruction, int instruction_len, int num_prompts,
-                     const LIBSSH2_USERAUTH_KBDINT_PROMPT *prompts,
-                     LIBSSH2_USERAUTH_KBDINT_RESPONSE *responses,
-                     void **abstract);
-
-        void connect();
-        
-        static void handle_trace( LIBSSH2_SESSION* session, void* context, const char* data, size_t length );
-
-        void close();
-        void authenticate();
-
-        bool try_pass();
-        bool try_keyboard();
-        bool try_pub_key();
-
-        // don't call this "unlocked" version directly
-        template <typename T>
-        int call_ssh2_function_unlocked(const T& lambda, bool check_for_errors = true);
-
-        // calls into libssh2, waits and retries the function if we get LIBSSH2_ERROR_EAGAIN
-        template <typename T>
-        int call_ssh2_function(const T& lambda, bool check_for_errors = true);
-
-        // calls into libssh2, waits and retries the function if we get LIBSSH2_ERROR_EAGAIN
-        // if libssh2 returns an error, get extended info and throw a message with ${code} and ${message} 
-        // set appropriately.
-        template <typename T>
-        int call_ssh2_function_throw(const T& lambda, const char* message = "libssh2 call failed ${code} - ${message}", bool check_for_errors = true);
-
-        // this version is a little different, it handles functions like libssh2_sftp_init which return 
-        // a pointer instead of an int.  These retry automatically if the result is NULL and the error
-        // is LIBSSH2_ERROR_EAGAIN
-        template <typename return_type>
-        return_type call_ssh2_ptr_function_throw(std::function<return_type()> lambda, const char* message = "libssh2 call failed ${code} - ${message}", bool check_for_errors = true);
-
-        void wait_on_socket(int additionalDirections = 0);
-
-        void init_sftp();
-    };
-
-
-    // #define OLD_BLOCKING, 
-    // the OLD_BLOCKING version of these functions will ensure that if a libssh2 function returns 
-    // LIBSSH2_ERROR_EAGAIN, no other libssh2 functions will be called until that function has been
-    // called again and returned some other value.
-    //
-    // if you don't define this and use the new version of this, we will release the lock and let
-    // other libssh2 functions be called *unless* it appears that there was unwritten data.
-    //
-    // the OLD_BLOCKING version is too conservative -- if you try to read on a channel that doesn't
-    // have any data, you're likely to deadlock.  The new version is not heavily tested and may be 
-    // too lax, time will tell.
-#ifdef OLD_BLOCKING
-    // don't call this "unlocked" version directly
-    template <typename T>
-    int client_impl::call_ssh2_function_unlocked(const T& lambda, bool check_for_errors /* = true */) {
-      int ec = lambda();
-      while (ec == LIBSSH2_ERROR_EAGAIN ) {
-        wait_on_socket();
-        ec = lambda();
-      }
-
-      // this assert catches bugs in libssh2 if libssh2 returns ec != LIBSSH2_ERROR_EAGAIN
-      // but the internal session data indicates a data write is still in progress
-      // set check_for_errors to false when closing the connection
-      assert(!check_for_errors || !session->packet.olen);
-	  
-      return ec;
-    }
-
-    // calls into libssh2, waits and retries the function if we get LIBSSH2_ERROR_EAGAIN
-    template <typename T>
-    int client_impl::call_ssh2_function(const T& lambda, bool check_for_errors /* = true */) {
-      fc::scoped_lock<fc::mutex> lock(ssh_session_mutex);
-      return call_ssh2_function_unlocked(lambda, check_for_errors);
-    }
-#else
-    // calls into libssh2, waits and retries the function if we get LIBSSH2_ERROR_EAGAIN
-    template <typename T>
-    int client_impl::call_ssh2_function(const T& lambda, bool check_for_errors /* = true */) {
-      fc::unique_lock<fc::mutex> lock(ssh_session_mutex);
-      int ec = lambda();
-      while (ec == LIBSSH2_ERROR_EAGAIN) {
-        bool unlock_to_wait = !session->packet.olen;
-        if (unlock_to_wait)
-          lock.unlock();
-        wait_on_socket();
-        if (unlock_to_wait)
-          lock.lock();
-        ec = lambda();
-      }
-      // this assert catches bugs in libssh2 if libssh2 returns ec != LIBSSH2_ERROR_EAGAIN
-      // but the internal session data indicates a data write is still in progress
-      // set check_for_errors to false when closing the connection
-      assert(!check_for_errors || !session->packet.olen);
-      return ec;
-    }
-#endif
-
-#ifdef OLD_BLOCKING
-    // calls into libssh2, waits and retries the function if we get LIBSSH2_ERROR_EAGAIN
-    // if libssh2 returns an error, get extended info and throw a message with ${code} and ${message} 
-    // set appropriately.
-    template <typename T>
-    int client_impl::call_ssh2_function_throw(const T& lambda, const char* message /* = "libssh2 call failed ${code} - ${message}" */, bool check_for_errors /* = true */) {
-      fc::scoped_lock<fc::mutex> lock(ssh_session_mutex);
-      int ec = call_ssh2_function_unlocked(lambda, check_for_errors);
-
-      if (ec == LIBSSH2_ERROR_SFTP_PROTOCOL && sftp) {
-        ec = libssh2_sftp_last_error(sftp);
-        FC_THROW(message, ("code", ec).set("message", "SFTP protocol error"));
-      } else if( ec < 0 ) {
-        char* msg = 0;
-        ec = libssh2_session_last_error( session, &msg, 0, 0 );
-        FC_THROW(message, ("code",ec).set("message",msg));
-      }
-      return ec;
-    }
-#else
-    // calls into libssh2, waits and retries the function if we get LIBSSH2_ERROR_EAGAIN
-    // if libssh2 returns an error, get extended info and throw a message with ${code} and ${message} 
-    // set appropriately.
-    template <typename T>
-    int client_impl::call_ssh2_function_throw(const T& lambda, const char* message /* = "libssh2 call failed ${code} - ${message}" */, bool check_for_errors /* = true */) {
-      fc::unique_lock<fc::mutex> lock(ssh_session_mutex);
-      int ec = lambda();
-      while (ec == LIBSSH2_ERROR_EAGAIN) {
-        bool unlock_to_wait = !session->packet.olen;
-        if (unlock_to_wait)
-          lock.unlock();
-        wait_on_socket();
-        if (unlock_to_wait)
-          lock.lock();
-        ec = lambda();
-      }
-      // this assert catches bugs in libssh2 if libssh2 returns ec != LIBSSH2_ERROR_EAGAIN
-      // but the internal session data indicates a data write is still in progress
-      // set check_for_errors to false when closing the connection
-      assert(!check_for_errors || !session->packet.olen);
-
-      if (ec == LIBSSH2_ERROR_SFTP_PROTOCOL && sftp) {
-        ec = libssh2_sftp_last_error(sftp);
-        FC_THROW(message, ("code", ec).set("message", "SFTP protocol error"));
-      } else if( ec < 0 ) {
-        char* msg = 0;
-        ec = libssh2_session_last_error( session, &msg, 0, 0 );
-        FC_THROW(message, ("code",ec).set("message",msg));
-      }
-      return ec;
-    }
-#endif
-
-#ifdef OLD_BLOCKING
-    // this version is a little different, it handles functions like libssh2_sftp_init which return 
-    // a pointer instead of an int.  These retry automatically if the result is NULL and the error
-    // is LIBSSH2_ERROR_EAGAIN
-    template <typename return_type>
-    return_type client_impl::call_ssh2_ptr_function_throw(std::function<return_type()> lambda, const char* message /* = "libssh2 call failed ${code} - ${message}" */, bool check_for_errors /* = true */) {
-      fc::scoped_lock<fc::mutex> lock(ssh_session_mutex);
-      return_type ret = lambda();
-      while (!ret) {
-        char* msg = 0;
-        int   ec = libssh2_session_last_error(session,&msg,NULL,0);
-        if ( ec == LIBSSH2_ERROR_EAGAIN ) {
-          wait_on_socket();
-          ret = lambda();
-        } else if (ec == LIBSSH2_ERROR_SFTP_PROTOCOL && sftp) {
-          ec = libssh2_sftp_last_error(sftp);
-          FC_THROW(message, ("code", ec).set("message", "SFTP protocol error"));
-        } else {
-          ec = libssh2_session_last_error( session, &msg, 0, 0 );
-          FC_THROW(message, ("code",ec).set("message",msg));
-        }
-      }
-      assert(!check_for_errors || !session->packet.olen);
-
-      return ret;
-    }
-#else
-    // this version is a little different, it handles functions like libssh2_sftp_init which return 
-    // a pointer instead of an int.  These retry automatically if the result is NULL and the error
-    // is LIBSSH2_ERROR_EAGAIN
-    template <typename return_type>
-    return_type client_impl::call_ssh2_ptr_function_throw(std::function<return_type()> lambda, const char* message /* = "libssh2 call failed ${code} - ${message}" */, bool check_for_errors /* = true */) {
-      fc::unique_lock<fc::mutex> lock(ssh_session_mutex);
-      return_type ret = lambda();
-      while (!ret) {
-        char* msg = 0;
-        int   ec = libssh2_session_last_error(session,&msg,NULL,0);
-        if ( ec == LIBSSH2_ERROR_EAGAIN ) {
-          bool unlock_to_wait = !session->packet.olen;
-          if (unlock_to_wait)
-            lock.unlock();
-          wait_on_socket();
-          if (unlock_to_wait)
-            lock.lock();
-          ret = lambda();
-        } else if (ec == LIBSSH2_ERROR_SFTP_PROTOCOL && sftp) {
-          ec = libssh2_sftp_last_error(sftp);
-          FC_THROW(message, ("code", ec).set("message", "SFTP protocol error"));
-        } else {
-          ec = libssh2_session_last_error( session, &msg, 0, 0 );
-          FC_THROW(message, ("code",ec).set("message",msg));
-        }
-      }
-      assert(!check_for_errors || !session->packet.olen);
-
-      return ret;
-    }
-#endif
-  }
-
-} }
diff --git a/src/ssh/process.cpp b/src/ssh/process.cpp
deleted file mode 100644
index 8794c11..0000000
--- a/src/ssh/process.cpp
+++ /dev/null
@@ -1,334 +0,0 @@
-#define NOMINMAX // prevent windows from defining min and max macros
-#include <libssh2.h>
-#include <libssh2_sftp.h>
-
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-
-#include <fc/ssh/client.hpp>
-#include <fc/ssh/process.hpp>
-#include <fc/io/sstream.hpp>
-#include <fc/vector.hpp>
-#include <fc/thread/unique_lock.hpp>
-
-#include "client_impl.hpp"
-
-#if defined (_MSC_VER)
-#pragma warning (disable : 4355)
-#endif
-
-namespace fc { namespace ssh {
-  
-  namespace detail {
-    class process_impl;
-    class process_istream : public fc::istream {
-       public:
-          process_istream( process_impl& p, int c )
-          :proc(p),chan(c){}
-
-          virtual size_t readsome( char* buf, size_t len );
-
-          virtual bool eof() const;
-
-          process_impl& proc;
-          int           chan;
-    };
-
-    class process_ostream : public fc::ostream {
-      public:
-          process_ostream( process_impl& p )
-          :proc(p){}
-
-          virtual size_t writesome( const char* buf, size_t len );
-          virtual void   close();
-          virtual void   flush();
-
-          process_impl& proc;
-    };
-
-    class process_impl {
-      public:
-        process_impl( client_ptr c );
-        ~process_impl();
-        //process_impl( const client& c, const fc::string& cmd, const fc::string& pty_type );
-        void exec(const fc::path& exe, vector<string> args, 
-                  const fc::path& work_dir /* = fc::path() */, fc::iprocess::exec_opts opts /* = open_all */);
-
-
-        int read_some( char* data, size_t len, int stream_id );
-        int write_some( const char* data, size_t len, int stream_id );
-        void flush();
-        void send_eof();
-
-        LIBSSH2_CHANNEL*      chan;
-        client_ptr sshc;
-        buffered_ostream_ptr buffered_std_in;
-        buffered_istream_ptr buffered_std_out;
-        buffered_istream_ptr buffered_std_err;
-
-        fc::string            command;
-        fc::promise<int>::ptr result;
-
-        fc::optional<int>     return_code;
-        fc::ostring           return_signal;
-        fc::ostring           return_signal_message;
-    private:
-        static fc::string windows_shell_escape(const fc::string& str);
-        static fc::string unix_shell_escape(const fc::string& str);
-        static fc::string windows_shell_escape_command(const fc::path& exe, const vector<string>& args);
-        static fc::string unix_shell_escape_command(const fc::path& exe, const vector<string>& args);
-    };
-
-  } // end namespace detail
-
-
-  process::process(client_ptr c) :
-    my(new detail::process_impl(c))
-  {}
-
-  process::~process()
-  {}
-
-  iprocess& process::exec( const fc::path& exe, vector<string> args, 
-                           const fc::path& work_dir /* = fc::path() */, exec_opts opts /* = open_all */ ) {
-    my->exec(exe, args, work_dir, opts);
-    return *this;
-  }
-
-  /**
-   *  Blocks until the result code of the process has been returned.
-   */
-  int process::result() {
-    if (!my->return_code && !my->return_signal) {
-      // we don't have any cached exit status, so wait and obtain the values now
-      my->sshc->my->call_ssh2_function(boost::bind(libssh2_channel_wait_eof, my->chan));
-      my->sshc->my->call_ssh2_function_throw(boost::bind(libssh2_channel_wait_closed, my->chan),
-                                                        "Error waiting on socket to close: ${message}");
-
-      char* exit_signal;
-      char* error_message;
-      libssh2_channel_get_exit_signal(my->chan, &exit_signal, NULL, &error_message, NULL, NULL, NULL);
-      if (exit_signal) {
-        // process terminated with a signal
-        my->return_signal = exit_signal;
-        libssh2_free(my->chan->session, exit_signal);
-        if (error_message) {
-          my->return_signal_message = error_message;
-          libssh2_free(my->chan->session, error_message);
-        }
-      } else
-        my->return_code = libssh2_channel_get_exit_status(my->chan);
-    }
-    if (my->return_signal)
-      FC_THROW("process terminated with signal ${signal}: ${signal_message}", ("signal", *my->return_signal)
-                                                                              ("signal_message", my->return_signal_message ? *my->return_signal_message : ""));
-    else
-      return *my->return_code;
-  }
-
-  void process::kill() {
-    elog("error: fc::ssh::process::kill() not supported");
-  }
-
-
-  /**
-   *  @brief returns a stream that writes to the procss' stdin
-   */
-  fc::buffered_ostream_ptr process::in_stream() {
-    return my->buffered_std_in;
-  }
-
-  /**
-   *  @brief returns a stream that reads from the process' stdout
-   */
-  fc::buffered_istream_ptr process::out_stream() {
-    return my->buffered_std_out;
-  }
-
-  /**
-   *  @brief returns a stream that reads from the process' stderr
-   */
-  fc::buffered_istream_ptr process::err_stream() {
-    return my->buffered_std_err;
-  }
-
-  void detail::process_impl::flush() {
-      if( !chan ) return;
-     /*    channel_flush deleates input buffer, and does not ensure writes go out 
-      *
-      int ec = libssh2_channel_flush_ex( chan, LIBSSH2_CHANNEL_FLUSH_EXTENDED_DATA);
-      while( ec == LIBSSH2_ERROR_EAGAIN ) {
-        sshc.my->wait_on_socket();
-        ec = libssh2_channel_flush_ex( chan, LIBSSH2_CHANNEL_FLUSH_EXTENDED_DATA );
-      }
-      ec = libssh2_channel_flush( chan );
-      while( ec == LIBSSH2_ERROR_EAGAIN ) {
-        sshc.my->wait_on_socket();
-        ec = libssh2_channel_flush( chan );
-      }
-      if( ec < 0 ) {
-        FC_THROW( "ssh flush failed", ( "channel_error", ec)  );
-      }
-      */
-  }
-
-  int detail::process_impl::read_some( char* data, size_t len, int stream_id ){
-       if( !sshc->my->session ) { FC_THROW( "Session closed" ); }
-       int rc;
-       char* buf = data;
-       size_t buflen = len;
-       do {
-           rc = sshc->my->call_ssh2_function_throw(boost::bind(libssh2_channel_read_ex, chan, stream_id, buf, buflen),
-                                                              "read failed: ${message}");
-           if( rc > 0 ) {
-              buf += rc;
-              buflen -= rc;
-              return buf-data;
-           } else if( rc == 0 ) {
-              if( libssh2_channel_eof( chan ) )
-                return -1; // eof
-              sshc->my->wait_on_socket();
-           }
-       } while( rc >= 0 && buflen);
-       return buf-data;
-  }
-
-  int detail::process_impl::write_some( const char* data, size_t len, int stream_id ) {
-     if( !sshc->my->session ) { FC_THROW( "Session closed" ); }
-
-     int rc;
-     const char* buf = data;
-     size_t buflen = len;
-     do {
-         rc = sshc->my->call_ssh2_function_throw(boost::bind(libssh2_channel_write_ex, chan, stream_id, buf, buflen),
-                                                            "write failed: ${message}");
-         if( rc > 0 ) {
-            buf += rc;
-            buflen -= rc;
-            return buf-data;
-         } else if( rc == 0 ) {
-            if( libssh2_channel_eof( chan ) )  {
-              FC_THROW( "EOF" );
-              //return -1; // eof
-            }
-         }
-     } while( rc >= 0 && buflen);
-     return buf-data;
-  }
-
-  void detail::process_impl::send_eof() {
-    if( sshc->my->session )
-      sshc->my->call_ssh2_function_throw(boost::bind(libssh2_channel_send_eof, chan),
-                                                    "send eof failed: ${message}");
-  }
-
-   size_t detail::process_istream::readsome( char* buf, size_t len ) {
-     int bytesRead = proc.read_some(buf, len, chan);
-     if (bytesRead < 0)
-       FC_THROW("EOF");
-     else
-       return bytesRead;
-   }
-
-   bool detail::process_istream::eof()const { 
-      return 0 != libssh2_channel_eof( proc.chan );
-   }
-
-   size_t detail::process_ostream::writesome( const char* buf, size_t len ) {
-     return proc.write_some(buf, len, 0);
-   }
-
-   void   detail::process_ostream::close(){
-      proc.send_eof();
-   }
-
-   void   detail::process_ostream::flush(){
-      proc.flush();
-   }
-
-   detail::process_impl::process_impl( client_ptr c )
-     :chan(nullptr),
-      sshc(c),
-      buffered_std_in(new buffered_ostream(ostream_ptr(new process_ostream(*this)))),
-      buffered_std_out(new buffered_istream(istream_ptr(new process_istream(*this, 0)))),
-      buffered_std_err(new buffered_istream(istream_ptr(new process_istream(*this, SSH_EXTENDED_DATA_STDERR))))
-   {
-   }
-
-   detail::process_impl::~process_impl() {
-     if (chan) {
-       sshc->my->call_ssh2_function(boost::bind(libssh2_channel_free, chan));
-       chan = NULL;
-     }
-   }
-
-   // these rules work pretty well for a standard bash shell on unix
-   fc::string detail::process_impl::unix_shell_escape(const fc::string& str) {
-     if (str.find_first_of(" ;&|><*?`$(){}[]!#'\"") == fc::string::npos)
-        return str;
-     fc::string escaped_quotes(str);
-     for (size_t start = escaped_quotes.find("'");
-          start != fc::string::npos;
-          start = escaped_quotes.find("'", start + 5))
-        escaped_quotes.replace(start, 1, "'\"'\"'");
-     fc::string escaped_str("\'");
-     escaped_str += escaped_quotes;
-     escaped_str += "\'";
-     return escaped_str;
-   }
-   fc::string detail::process_impl::unix_shell_escape_command(const fc::path& exe, const vector<string>& args) {
-     fc::stringstream command_line;
-     command_line << unix_shell_escape(exe.string());
-     for (unsigned i = 0; i < args.size(); ++i)
-       command_line << " " << unix_shell_escape(args[i]);
-     return command_line.str();
-   }
-
-   // windows command-line escaping rules are a disaster, partly because how the command-line is 
-   // parsed depends on what program you're running.  In windows, the command line is passed in
-   // as a single string, and the process is left to interpret it as it sees fit.  The standard
-   // C runtime uses one set of rules, the function CommandLineToArgvW usually used by
-   // GUI-mode programs uses a different set. 
-   // Here we try to find a common denominator that works well for simple cases
-   // it's only minimally tested right now due to time constraints.
-   fc::string detail::process_impl::windows_shell_escape(const fc::string& str) {
-     if (str.find_first_of(" \"") == fc::string::npos)
-        return str;
-     fc::string escaped_quotes(str);
-     for (size_t start = escaped_quotes.find("\"");
-          start != fc::string::npos;
-          start = escaped_quotes.find("\"", start + 2))
-        escaped_quotes.replace(start, 1, "\\\"");
-     fc::string escaped_str("\"");
-     escaped_str += escaped_quotes;
-     escaped_str += "\"";
-     return escaped_str;
-   }
-   fc::string detail::process_impl::windows_shell_escape_command(const fc::path& exe, const vector<string>& args) {
-     fc::stringstream command_line;
-     command_line << windows_shell_escape(exe.string());
-     for (unsigned i = 0; i < args.size(); ++i)
-       command_line << " " << windows_shell_escape(args[i]);
-     return command_line.str();
-   }
-
-   void detail::process_impl::exec(const fc::path& exe, vector<string> args, 
-                                   const fc::path& work_dir /* = fc::path() */, 
-                                   fc::iprocess::exec_opts opts /* = open_all */) { 
-        chan = sshc->my->open_channel(""); 
-
-        sshc->my->call_ssh2_function(boost::bind(libssh2_channel_handle_extended_data2, chan, LIBSSH2_CHANNEL_EXTENDED_DATA_NORMAL));
-
-        try {
-          fc::scoped_lock<fc::mutex> process_startup_lock(sshc->my->process_startup_mutex);
-          fc::string command_line = sshc->my->remote_system_is_windows ? windows_shell_escape_command(exe, args) : unix_shell_escape_command(exe, args);
-          sshc->my->call_ssh2_function_throw(boost::bind(libssh2_channel_process_startup, chan, "exec", sizeof("exec") - 1, command_line.c_str(), command_line.size()),
-					    "exec failed: ${message}"); // equiv to libssh2_channel_exec(chan, cmd) macro
-        } catch (fc::exception& er) {
-           elog( "error starting process" );
-           FC_RETHROW_EXCEPTION(er, error, "error starting process");
-        }
-   }
-
-} }

From b973a4432d902495e1a907d9f7e79ada831e28bc Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Fri, 13 Jan 2017 15:59:38 -0600
Subject: [PATCH 079/108] Update submodules

---
 .gitmodules                     | 10 +++++-----
 vendor/diff-match-patch-cpp-stl |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 22610c4..0c2a833 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
+[submodule "vendor/diff-match-patch-cpp-stl"]
+    path = vendor/diff-match-patch-cpp-stl
+    url = https://github.com/leutloff/diff-match-patch-cpp-stl
 [submodule "vendor/secp256k1-zkp"]
-	path = vendor/secp256k1-zkp
-	url = https://github.com/cryptonomex/secp256k1-zkp.git
+    path = vendor/secp256k1-zkp
+    url = https://github.com/bitshares/secp256k1-zkp.git
 [submodule "vendor/websocketpp"]
     path = vendor/websocketpp
     url = https://github.com/zaphoyd/websocketpp.git
-[submodule "vendor/diff-match-patch-cpp-stl"]
-	path = vendor/diff-match-patch-cpp-stl
-	url = https://github.com/leutloff/diff-match-patch-cpp-stl
diff --git a/vendor/diff-match-patch-cpp-stl b/vendor/diff-match-patch-cpp-stl
index aee799a..7f95b37 160000
--- a/vendor/diff-match-patch-cpp-stl
+++ b/vendor/diff-match-patch-cpp-stl
@@ -1 +1 @@
-Subproject commit aee799a31d08977b166fb19cad794730717e3304
+Subproject commit 7f95b37e554453262e2bcda830724fc362614103

From c1361d8cf97de719b6fd0ece244b3ae51d472e3e Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Fri, 13 Jan 2017 18:36:35 -0600
Subject: [PATCH 080/108] Add fork note to README

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 31b0e44..5e7feef 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 fc
 ==
 
+**NOTE:** This fork reverts upstream commit a421e280488385cab26a42153f7ce3c8d5b6281f to avoid changing the BitShares API.
+
 FC stands for fast-compiling c++ library and provides a set of utility libraries useful
 for the development of asynchronous libraries.  Some of the highlights include:
 

From aed35f5b068c5798e55440348b0d85f9cf9b4f72 Mon Sep 17 00:00:00 2001
From: elmato <matias.romeo@gmail.com>
Date: Mon, 16 Jan 2017 19:55:17 +0000
Subject: [PATCH 081/108] Add access to HTTP request headers in
 websocket_connection

---
 include/fc/network/http/websocket.hpp | 2 ++
 src/network/http/websocket.cpp        | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/include/fc/network/http/websocket.hpp b/include/fc/network/http/websocket.hpp
index 210211e..f56b4be 100644
--- a/include/fc/network/http/websocket.hpp
+++ b/include/fc/network/http/websocket.hpp
@@ -29,6 +29,8 @@ namespace fc { namespace http {
          void     set_session_data( fc::any d ){ _session_data = std::move(d); }
          fc::any& get_session_data() { return _session_data; }
 
+         virtual std::string get_request_header(const std::string& key) = 0;
+
          fc::signal<void()> closed;
       private:
          fc::any                                   _session_data;
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
index 1f92f77..7f26b4d 100644
--- a/src/network/http/websocket.cpp
+++ b/src/network/http/websocket.cpp
@@ -168,6 +168,11 @@ namespace fc { namespace http {
                _ws_connection->close(code,reason);
             }
 
+            virtual std::string get_request_header(const std::string& key)override
+            {
+              return _ws_connection->get_request_header(key);
+            }
+
             T _ws_connection;
       };
 

From 0688b7eb6489e6ea0bf9f6e724c1baa3b5359a41 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Wed, 25 Jan 2017 10:16:02 -0500
Subject: [PATCH 082/108] Time execution of rpc API call and log long executing
 calls. #9

---
 src/rpc/websocket_api.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index 0ff9304..efbb1d1 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -98,7 +98,15 @@ std::string websocket_api_connection::on_message(
          {
             try
             {
+               auto start = time_point::now();
                auto result = _rpc_state.local_call( call.method, call.params );
+               auto end = time_point::now();
+
+               if( end - start > fc::seconds( 1 ) )
+                  elog( "API call execution time limit exceeded.", ("method",call.method)("params",call.params)("time", end - start) );
+               else if( end - start > fc::milliseconds( 750 ) )
+                  wlog( "API call execution time nearing limit.", ("method",call.method)("params",call.params)("time", end - start) );
+
                if( call.id )
                {
                   auto reply = fc::json::to_string( response( *call.id, result ) );

From c1a0dca92f18c504c444da706b722c46c7770206 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Wed, 25 Jan 2017 11:16:52 -0500
Subject: [PATCH 083/108] Refactor to use cmake build options #9

---
 CMakeLists.txt            | 14 ++++++++++++++
 src/rpc/websocket_api.cpp | 10 ++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6d7774..3291c9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -341,6 +341,20 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBSOCKETPP_STRICT_MASKING")
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DBOOST_ASIO_HAS_STD_CHRONO")
 
+OPTION( LOG_LONG_API "Log long API calls over websocket (ON OR OFF)" ON )
+MESSAGE( STATUS "LOG_LONG_API: ${LOG_LONG_API}" )
+if( LOG_LONG_API )
+  SET( LOG_LONG_API_MAX_MS 1000 CACHE STRING "Max API execution time in ms" )
+  SET( LOG_LONG_API_WARN_MS 750 CACHE STRING "API execution time in ms at which to warn" )
+  MESSAGE( STATUS "     " )
+  MESSAGE( STATUS "     LOGGING LONG API CALLS" )
+  MESSAGE( STATUS "          MAX  MS: ${LOG_LONG_API_MAX_MS}" )
+  MESSAGE( STATUS "          WARN MS: ${LOG_LONG_API_WARN_MS}" )
+  MESSAGE( STATUS "     " )
+  SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLOG_LONG_API -DLOG_LONG_API_MAX_MS=${LOG_LONG_API_MAX_MS} -DLOG_LONG_API_WARN_MS=${LOG_LONG_API_WARN_MS}" )
+  SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DLOG_LONG_API -DLOG_LONG_API_MAX_MS=${LOG_LONG_API_MAX_MS} -DLOG_LONG_API_WARN_MS=${LOG_LONG_API_WARN_MS}" )
+endif()
+
 target_include_directories(fc
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${Boost_INCLUDE_DIR}
diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index efbb1d1..8843f9e 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -98,14 +98,20 @@ std::string websocket_api_connection::on_message(
          {
             try
             {
+#ifdef LOG_LONG_API
                auto start = time_point::now();
+#endif
+
                auto result = _rpc_state.local_call( call.method, call.params );
+
+#ifdef LOG_LONG_API
                auto end = time_point::now();
 
-               if( end - start > fc::seconds( 1 ) )
+               if( end - start > fc::milliseconds( LOG_LONG_API_MAX_MS ) )
                   elog( "API call execution time limit exceeded.", ("method",call.method)("params",call.params)("time", end - start) );
-               else if( end - start > fc::milliseconds( 750 ) )
+               else if( end - start > fc::milliseconds( LOG_LONG_API_WARN_MS ) )
                   wlog( "API call execution time nearing limit.", ("method",call.method)("params",call.params)("time", end - start) );
+#endif
 
                if( call.id )
                {

From dd36202e74262b551588e88063e982ecf6bcd4f2 Mon Sep 17 00:00:00 2001
From: elmato <matias.romeo@gmail.com>
Date: Fri, 27 Jan 2017 05:38:16 +0000
Subject: [PATCH 084/108] Replace the call to get_api_by_name with a direct
 call to the functions that return fc::api<> in the login_api.

If the call to any of this functions succeed (because they where previously enabled),
the api will auto-register itself in the websocket_api_connection/http_api_connection and will return an api_id_type.
---
 src/rpc/http_api.cpp      | 4 +---
 src/rpc/websocket_api.cpp | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/rpc/http_api.cpp b/src/rpc/http_api.cpp
index 281febd..c9571a2 100644
--- a/src/rpc/http_api.cpp
+++ b/src/rpc/http_api.cpp
@@ -17,9 +17,7 @@ http_api_connection::http_api_connection()
       api_id_type api_id;
       if( args[0].is_string() )
       {
-         variants subargs;
-         subargs.push_back( args[0] );
-         variant subresult = this->receive_call( 1, "get_api_by_name", subargs );
+         variant subresult = this->receive_call( 1, args[0].as_string() );
          api_id = subresult.as_uint64();
       }
       else
diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index 6342b6f..3c6efef 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -16,9 +16,7 @@ websocket_api_connection::websocket_api_connection( fc::http::websocket_connecti
       api_id_type api_id;
       if( args[0].is_string() )
       {
-         variants subargs;
-         subargs.push_back( args[0] );
-         variant subresult = this->receive_call( 1, "get_api_by_name", subargs );
+         variant subresult = this->receive_call( 1, args[0].as_string() );
          api_id = subresult.as_uint64();
       }
       else

From 7144cdc20b28e11e1348b1268cb42b346c860305 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Fri, 27 Jan 2017 12:07:50 -0500
Subject: [PATCH 085/108] Actually log methods and params #9

---
 src/rpc/websocket_api.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index 8843f9e..5f86474 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -108,9 +108,9 @@ std::string websocket_api_connection::on_message(
                auto end = time_point::now();
 
                if( end - start > fc::milliseconds( LOG_LONG_API_MAX_MS ) )
-                  elog( "API call execution time limit exceeded.", ("method",call.method)("params",call.params)("time", end - start) );
+                  elog( "API call execution time limit exceeded. method: ${m} params: ${p} time: ${t}", ("m",call.method)("p",call.params)("t", end - start) );
                else if( end - start > fc::milliseconds( LOG_LONG_API_WARN_MS ) )
-                  wlog( "API call execution time nearing limit.", ("method",call.method)("params",call.params)("time", end - start) );
+                  wlog( "API call execution time nearing limit. method: ${m} params: ${p} time: ${t}", ("m",call.method)("p",call.params)("t", end - start) );
 #endif
 
                if( call.id )

From fe829980210d68b7878dc01df1ab23b197d759d7 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Thu, 16 Mar 2017 12:29:57 -0500
Subject: [PATCH 086/108] Remove NTP

---
 .gitignore                 |   1 -
 CMakeLists.txt             |   1 -
 include/fc/network/ntp.hpp |  27 ----
 src/network/ntp.cpp        | 272 -------------------------------------
 tests/CMakeLists.txt       |   4 -
 tests/network/ntp_test.cpp |  30 ----
 6 files changed, 335 deletions(-)
 delete mode 100644 include/fc/network/ntp.hpp
 delete mode 100644 src/network/ntp.cpp
 delete mode 100644 tests/network/ntp_test.cpp

diff --git a/.gitignore b/.gitignore
index 5d3e633..8f529ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,5 +48,4 @@ fc_automoc.cpp
 git_revision.cpp
 GitSHA3.cpp
 
-ntp_test
 task_cancel_test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd6d201..aabe26a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,7 +230,6 @@ set( fc_sources
      src/network/http/http_connection.cpp
      src/network/http/http_server.cpp
      src/network/http/websocket.cpp
-     src/network/ntp.cpp
      src/network/ip.cpp
      src/network/rate_limiting.cpp
      src/network/resolve.cpp
diff --git a/include/fc/network/ntp.hpp b/include/fc/network/ntp.hpp
deleted file mode 100644
index 6067b3c..0000000
--- a/include/fc/network/ntp.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-#include <string>
-#include <memory>
-#include <fc/time.hpp>
-#include <fc/optional.hpp>
-
-
-namespace fc {
-
-   namespace detail { class ntp_impl; }
-
-   class ntp 
-   {
-      public:
-         ntp();
-         ~ntp();
-
-         void add_server( const std::string& hostname, uint16_t port = 123 );
-         void set_request_interval( uint32_t interval_sec );
-         void request_now();
-         optional<time_point> get_time()const;
-
-      private:
-        std::unique_ptr<detail::ntp_impl> my;
-   };
-
-} // namespace fc
diff --git a/src/network/ntp.cpp b/src/network/ntp.cpp
deleted file mode 100644
index 5c0a085..0000000
--- a/src/network/ntp.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-#include <fc/network/ntp.hpp>
-#include <fc/network/udp_socket.hpp>
-#include <fc/network/resolve.hpp>
-#include <fc/network/ip.hpp>
-#include <fc/thread/thread.hpp>
-
-#include <stdint.h>
-#include "../byteswap.hpp"
-
-#include <atomic>
-#include <array>
-
-namespace fc
-{
-  namespace detail {
-
-  class ntp_impl 
-  {
-    public:
-      /** vector < host, port >  */
-      fc::thread                                       _ntp_thread;
-      std::vector< std::pair< std::string, uint16_t> > _ntp_hosts;
-      fc::future<void>                                 _read_loop_done;
-      udp_socket                                       _sock;
-      uint32_t                                         _request_interval_sec;
-      uint32_t                                         _retry_failed_request_interval_sec;
-      fc::time_point                                   _last_valid_ntp_reply_received_time;
-
-      std::atomic_bool                                 _last_ntp_delta_initialized;
-      std::atomic<int64_t>                             _last_ntp_delta_microseconds;
-
-
-      fc::future<void>                                 _request_time_task_done;
-
-      ntp_impl() :
-      _ntp_thread("ntp"),
-      _request_interval_sec( 60*60 /* 1 hr */),
-      _retry_failed_request_interval_sec(60 * 5),
-      _last_ntp_delta_microseconds(0)
-      { 
-        _last_ntp_delta_initialized = false;
-        _ntp_hosts.push_back( std::make_pair( "pool.ntp.org",123 ) );
-      } 
-
-      ~ntp_impl() 
-      { 
-      }
-
-      fc::time_point ntp_timestamp_to_fc_time_point(uint64_t ntp_timestamp_net_order)
-      {
-        uint64_t ntp_timestamp_host = bswap_64(ntp_timestamp_net_order);
-        uint32_t fractional_seconds = ntp_timestamp_host & 0xffffffff;
-        uint32_t microseconds = (uint32_t)((((uint64_t)fractional_seconds * 1000000) + (uint64_t(1) << 31)) >> 32);
-        uint32_t seconds_since_1900 = ntp_timestamp_host >> 32;
-        uint32_t seconds_since_epoch = seconds_since_1900 - 2208988800;
-        return fc::time_point() + fc::seconds(seconds_since_epoch) + fc::microseconds(microseconds);
-      }
-
-      uint64_t fc_time_point_to_ntp_timestamp(const fc::time_point& fc_timestamp)
-      {
-        uint64_t microseconds_since_epoch = (uint64_t)fc_timestamp.time_since_epoch().count();
-        uint32_t seconds_since_epoch = (uint32_t)(microseconds_since_epoch / 1000000);
-        uint32_t seconds_since_1900 = seconds_since_epoch + 2208988800;
-        uint32_t microseconds = microseconds_since_epoch % 1000000;
-        uint32_t fractional_seconds = (uint32_t)((((uint64_t)microseconds << 32) + (uint64_t(1) << 31)) / 1000000);
-        uint64_t ntp_timestamp_net_order = ((uint64_t)seconds_since_1900 << 32) + fractional_seconds;
-        return bswap_64(ntp_timestamp_net_order);
-      }
-
-      void request_now()
-      {
-        assert(_ntp_thread.is_current());
-        for( auto item : _ntp_hosts )
-        {
-          try 
-          {
-            //wlog( "resolving... ${r}", ("r", item) );
-            auto eps = resolve( item.first, item.second );
-            for( auto ep : eps )
-            {
-             // wlog( "sending request to ${ep}", ("ep",ep) );
-              std::shared_ptr<char> send_buffer(new char[48], [](char* p){ delete[] p; });
-              std::array<unsigned char, 48> packet_to_send { {010,0,0,0,0,0,0,0,0} };
-              memcpy(send_buffer.get(), packet_to_send.data(), packet_to_send.size());
-              uint64_t* send_buf_as_64_array = (uint64_t*)send_buffer.get();
-              send_buf_as_64_array[5] = fc_time_point_to_ntp_timestamp(fc::time_point::now()); // 5 = Transmit Timestamp
-              _sock.send_to(send_buffer, packet_to_send.size(), ep);
-              break;
-            }
-          } 
-          catch (const fc::canceled_exception&)
-          {
-            throw;
-          }
-          // this could fail to resolve but we want to go on to other hosts..
-          catch ( const fc::exception& e )
-          {
-            elog( "${e}", ("e",e.to_detail_string() ) ); 
-          }
-        }
-      } // request_now
-
-      // started for first time in ntp() constructor, canceled in ~ntp() destructor
-      // this task gets invoked every _retry_failed_request_interval_sec (currently 5 min), and if
-      // _request_interval_sec (currently 1 hour) has passed since the last successful update, 
-      // it sends a new request
-      void request_time_task()
-      {
-        assert(_ntp_thread.is_current());
-        if (_last_valid_ntp_reply_received_time <= fc::time_point::now() - fc::seconds(_request_interval_sec - 5))
-          request_now();
-        if (!_request_time_task_done.valid() || !_request_time_task_done.canceled())
-          _request_time_task_done = schedule( [=](){ request_time_task(); }, 
-                                              fc::time_point::now() + fc::seconds(_retry_failed_request_interval_sec), 
-                                              "request_time_task" );
-      } // request_loop
-
-      void start_read_loop()
-      {
-        _read_loop_done = _ntp_thread.async( [this](){ read_loop(); }, "ntp_read_loop" );
-      }
-
-      void read_loop()
-      {
-        assert(_ntp_thread.is_current());
-
-        uint32_t receive_buffer_size = sizeof(uint64_t) * 1024;
-        std::shared_ptr<char> receive_buffer(new char[receive_buffer_size], [](char* p){ delete[] p; });
-        uint64_t* recv_buf = (uint64_t*)receive_buffer.get();
-
-        //outer while to restart read-loop if exception is thrown while waiting to receive on socket.
-        while( !_read_loop_done.canceled() )
-        {
-          // if you start the read while loop here, the recieve_from call will throw "invalid argument" on win32,
-          // so instead we start the loop after making our first request
-          try 
-          {
-            _sock.open();
-            request_time_task(); //this will re-send a time request
-
-            while( !_read_loop_done.canceled() )
-            {
-              fc::ip::endpoint from;
-              try
-              {
-                _sock.receive_from( receive_buffer, receive_buffer_size, from );
-              //  wlog("received ntp reply from ${from}",("from",from) );
-              } FC_RETHROW_EXCEPTIONS(error, "Error reading from NTP socket");
-
-              fc::time_point receive_time = fc::time_point::now();
-              fc::time_point origin_time = ntp_timestamp_to_fc_time_point(recv_buf[3]);
-              fc::time_point server_receive_time = ntp_timestamp_to_fc_time_point(recv_buf[4]);
-              fc::time_point server_transmit_time = ntp_timestamp_to_fc_time_point(recv_buf[5]);
-
-              fc::microseconds offset(((server_receive_time - origin_time) +
-                                       (server_transmit_time - receive_time)).count() / 2);
-              fc::microseconds round_trip_delay((receive_time - origin_time) -
-                                                (server_transmit_time - server_receive_time));
-              //wlog("origin_time = ${origin_time}, server_receive_time = ${server_receive_time}, server_transmit_time = ${server_transmit_time}, receive_time = ${receive_time}",
-              //     ("origin_time", origin_time)("server_receive_time", server_receive_time)("server_transmit_time", server_transmit_time)("receive_time", receive_time));
-              // wlog("ntp offset: ${offset}, round_trip_delay ${delay}", ("offset", offset)("delay", round_trip_delay));
-
-              //if the reply we just received has occurred more than a second after our last time request (it was more than a second ago since our last request)
-              if( round_trip_delay > fc::microseconds(300000) )
-              {
-                wlog("received stale ntp reply requested at ${request_time}, send a new time request", ("request_time", origin_time));
-                request_now(); //request another reply and ignore this one
-              }
-              else //we think we have a timely reply, process it
-              {
-                if( offset < fc::seconds(60*60*24) && offset > fc::seconds(-60*60*24) )
-                {
-                  _last_ntp_delta_microseconds = offset.count();
-                  _last_ntp_delta_initialized = true;
-                  fc::microseconds ntp_delta_time = fc::microseconds(_last_ntp_delta_microseconds);
-                  _last_valid_ntp_reply_received_time = receive_time;
-                  wlog("ntp_delta_time updated to ${delta_time} us", ("delta_time",ntp_delta_time) );
-                }
-                else
-                  elog( "NTP time and local time vary by more than a day! ntp:${ntp_time} local:${local}", 
-                       ("ntp_time", receive_time + offset)("local", fc::time_point::now()) );
-              }
-            }
-          } // try
-          catch (fc::canceled_exception)
-          {
-            throw;
-          }
-          catch (const fc::exception& e)
-          {
-            //swallow any other exception and restart loop
-            elog("exception in read_loop, going to restart it. ${e}",("e",e));
-          }
-          catch (...)
-          {
-            //swallow any other exception and restart loop
-            elog("unknown exception in read_loop, going to restart it.");
-          }
-          _sock.close();
-          fc::usleep(fc::seconds(_retry_failed_request_interval_sec));
-        } //outer while loop
-        wlog("exiting ntp read_loop");
-      } //end read_loop()
-    }; //ntp_impl
-
-  } // namespace detail
-
-
-
-  ntp::ntp()
-  :my( new detail::ntp_impl() )
-  {
-    my->start_read_loop();
-  }
-
-  ntp::~ntp()
-  {
-    my->_ntp_thread.async([=](){
-      try
-      {
-        my->_request_time_task_done.cancel_and_wait("ntp object is destructing");
-      }
-      catch ( const fc::exception& e )
-      {
-        wlog( "Exception thrown while shutting down NTP's request_time_task, ignoring: ${e}", ("e",e) );
-      }
-      catch (...)
-      {
-        wlog( "Exception thrown while shutting down NTP's request_time_task, ignoring" );
-      }
-      
-      try 
-      {
-        my->_read_loop_done.cancel_and_wait("ntp object is destructing");
-      } 
-      catch ( const fc::exception& e )
-      {
-        wlog( "Exception thrown while shutting down NTP's read_loop, ignoring: ${e}", ("e",e) );
-      }
-      catch (...)
-      {
-        wlog( "Exception thrown while shutting down NTP's read_loop, ignoring" );
-      }
-
-    }, "ntp_shutdown_task").wait();
-  }
-
-
-  void ntp::add_server( const std::string& hostname, uint16_t port)
-  {
-    my->_ntp_thread.async( [=](){ my->_ntp_hosts.push_back( std::make_pair(hostname,port) ); }, "add_server" ).wait();
-  }
-
-  void ntp::set_request_interval( uint32_t interval_sec )
-  {
-    my->_request_interval_sec = interval_sec;
-    my->_retry_failed_request_interval_sec = std::min(my->_retry_failed_request_interval_sec, interval_sec);
-  }
-
-  void ntp::request_now()
-  {
-    my->_ntp_thread.async( [=](){ my->request_now(); }, "request_now" ).wait();
-  }
-
-  optional<time_point> ntp::get_time()const
-  {
-    if( my->_last_ntp_delta_initialized )
-      return fc::time_point::now() + fc::microseconds(my->_last_ntp_delta_microseconds);
-    return optional<time_point>();
-  }
-
-} //namespace fc
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a1c9fef..1043e50 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -10,9 +10,6 @@ if( ECC_IMPL STREQUAL secp256k1 )
     target_link_libraries( blind fc )
 endif()
 
-add_executable( ntp_test all_tests.cpp network/ntp_test.cpp )
-target_link_libraries( ntp_test fc )
-
 add_executable( task_cancel_test all_tests.cpp thread/task_cancel.cpp )
 target_link_libraries( task_cancel_test fc )
 
@@ -52,7 +49,6 @@ add_executable( all_tests all_tests.cpp
                           crypto/dh_test.cpp
                           crypto/rand_test.cpp
                           crypto/sha_tests.cpp
-                          network/ntp_test.cpp
                           network/http/websocket_test.cpp
                           thread/task_cancel.cpp
                           bloom_test.cpp
diff --git a/tests/network/ntp_test.cpp b/tests/network/ntp_test.cpp
deleted file mode 100644
index 957d1e4..0000000
--- a/tests/network/ntp_test.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <boost/test/unit_test.hpp>
-
-#include <fc/network/ntp.hpp>
-#include <fc/log/logger.hpp>
-#include <fc/thread/thread.hpp>
-
-BOOST_AUTO_TEST_SUITE(fc_network)
-
-BOOST_AUTO_TEST_CASE( ntp_test )
-{
-   ilog("start ntp test");
-   fc::usleep( fc::seconds(1) );
-   ilog("done ntp test");
-   /*
-   fc::ntp ntp_service;
-   ntp_service.set_request_interval(5);
-   fc::usleep(fc::seconds(4) );
-   auto time = ntp_service.get_time();
-   BOOST_CHECK( time );
-   auto ntp_time = *time;
-   auto delta = ntp_time - fc::time_point::now();
-//   auto minutes = delta.count() / 1000000 / 60;
-//   auto hours = delta.count() / 1000000 / 60 / 60;
-//   auto seconds = delta.count() / 1000000;
-   auto msec= delta.count() / 1000;
-   BOOST_CHECK( msec < 100 );
-   */
-}
-
-BOOST_AUTO_TEST_SUITE_END()

From 0d0b485f3ab76d46da1bbe5d85c60a6d95e06bd4 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Thu, 16 Mar 2017 12:33:30 -0500
Subject: [PATCH 087/108] Remove GNTP (unrelated to NTP)

---
 CMakeLists.txt              |   1 -
 include/fc/network/gntp.hpp |  57 -------
 src/network/gntp.cpp        | 291 ------------------------------------
 3 files changed, 349 deletions(-)
 delete mode 100644 include/fc/network/gntp.hpp
 delete mode 100644 src/network/gntp.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aabe26a..e2ff40d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,7 +234,6 @@ set( fc_sources
      src/network/rate_limiting.cpp
      src/network/resolve.cpp
      src/network/url.cpp
-     src/network/gntp.cpp
      src/compress/smaz.cpp
      src/compress/zlib.cpp
      vendor/cyoencode-1.0.2/src/CyoDecode.c
diff --git a/include/fc/network/gntp.hpp b/include/fc/network/gntp.hpp
deleted file mode 100644
index fcfa656..0000000
--- a/include/fc/network/gntp.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#pragma once
-#include <fc/crypto/ripemd160.hpp>
-#include <fc/crypto/rand.hpp>
-#include <fc/optional.hpp>
-#include <fc/network/ip.hpp>
-
-#include <memory>
-#include <vector>
-
-namespace fc
-{
-  namespace detail {
-    class gntp_icon_impl;
-  }
-  class gntp_notifier;
-
-  class gntp_icon {
-  public:
-    gntp_icon(const char* buffer, size_t length);
-    ~gntp_icon();
-  private:
-    std::unique_ptr<detail::gntp_icon_impl> my;
-    friend class gntp_notifier;
-  };
-  typedef std::shared_ptr<gntp_icon> gntp_icon_ptr;
-
-  class gntp_notification_type {
-  public:
-    std::string   name;
-    std::string   display_name;
-    bool          enabled;
-    gntp_icon_ptr icon;
-  };
-  typedef std::vector<gntp_notification_type> gntp_notification_type_list;
-
-  namespace detail {
-    class gntp_notifier_impl;
-  }
-
-  typedef uint160_t gntp_guid;
-
-  class gntp_notifier {
-  public:
-    gntp_notifier(const std::string& host_to_notify = "127.0.0.1", uint16_t port = 23053,
-                  const optional<std::string>& password = optional<std::string>());
-    ~gntp_notifier();
-    void set_application_name(std::string application_name);
-    void set_application_icon(const gntp_icon_ptr& icon);
-    void register_notifications();
-    gntp_guid send_notification(std::string name, std::string title, std::string text, const gntp_icon_ptr& icon = gntp_icon_ptr(), optional<gntp_guid> coalescingId = optional<gntp_guid>());
-    void add_notification_type(const gntp_notification_type& notificationType);
-  private:
-    std::unique_ptr<detail::gntp_notifier_impl> my;
-  };
-
-
-} // namespace fc
diff --git a/src/network/gntp.cpp b/src/network/gntp.cpp
deleted file mode 100644
index 89c1735..0000000
--- a/src/network/gntp.cpp
+++ /dev/null
@@ -1,291 +0,0 @@
-#include <fc/network/gntp.hpp>
-#include <fc/exception/exception.hpp>
-
-#include <fc/log/logger.hpp>
-#include <fc/asio.hpp>
-#include <fc/network/tcp_socket.hpp>
-#include <fc/crypto/sha1.hpp>
-#include <fc/crypto/base32.hpp>
-#include <fc/crypto/sha256.hpp>
-#include <fc/crypto/rand.hpp>
-#include <fc/crypto/hex.hpp>
-
-#include <set>
-#include <boost/lexical_cast.hpp>
-#include <boost/foreach.hpp>
-#include <boost/algorithm/string/case_conv.hpp>
-
-namespace fc 
-{
-  namespace detail
-  {
-    static std::string calc_sha1_base32_of_buffer(const std::string& buffer)
-    {
-      sha1::encoder sha1_encoder;
-      sha1_encoder.write(buffer.c_str(), buffer.size());
-      sha1 sha1_result = sha1_encoder.result();
-      string sha1_result_base32 = to_base32((char*)&sha1_result, sizeof(sha1_result));
-      return sha1_result_base32.c_str();
-    }
-
-
-    class gntp_icon_impl
-    {
-    public:
-      std::string _icon_bytes;
-      std::string _sha1_hash;
-
-      gntp_icon_impl(const char* buffer, size_t length) :
-        _icon_bytes(buffer, length),
-        _sha1_hash(calc_sha1_base32_of_buffer(_icon_bytes))
-      {
-      }
-    };
-
-    class gntp_notifier_impl 
-    {
-    public:
-      gntp_notifier_impl(const std::string& host_to_notify = "127.0.0.1", uint16_t port = 23053, const optional<std::string>& password = optional<std::string>());
-
-      // there's no API to change these right now, it will always notify localhost at the default GNTP port
-      std::string hostname;
-      uint16_t port;
-      optional<std::string> password;
-
-      std::string application_name;
-      gntp_icon_ptr application_icon;
-
-      gntp_notification_type_list notification_types; // list of all notification types we're registered to send
-
-      optional<boost::asio::ip::tcp::endpoint> endpoint; // cache the last endpoint we've connected to
-
-      bool connection_failed; // true after we've tried to connect and failed
-      bool is_registered; // true after we've registered
-
-      void send_gntp_message(const std::string& message);
-    };
-
-    gntp_notifier_impl::gntp_notifier_impl(const std::string& host_to_notify /* = "127.0.0.1" */, uint16_t port /* = 23053 */,
-                                           const optional<std::string>& password /* = optional<std::string>() */) :
-      hostname(host_to_notify),
-      port(port),
-      password(password),
-      connection_failed(false),
-      is_registered(false)
-    {
-    }
-
-    void gntp_notifier_impl::send_gntp_message(const std::string& message)
-    {
-      std::shared_ptr<boost::asio::ip::tcp::socket> sock(new boost::asio::ip::tcp::socket(asio::default_io_service()));
-
-      bool connected = false;
-      if (endpoint)
-      {
-        // we've successfully connected before, connect to the same endpoint that worked last time
-        try
-        {
-          asio::tcp::connect(*sock, *endpoint);
-          connected = true;
-        }
-        catch (exception& er)
-        {
-          ilog("Failed to connect to GNTP service using an endpoint that previously worked: ${error_report}", 
-              ("error_report", er.to_detail_string()));
-          sock->close();
-          // clear the cached endpoint and fall through to the full connection procedure
-          endpoint = optional<boost::asio::ip::tcp::endpoint>();
-        }
-        catch (...)
-        {
-          ilog("Failed to connect to GNTP service using an endpoint that previously worked");
-          sock->close();
-          // clear the cached endpoint and fall through to the full connection procedure
-          endpoint = optional<boost::asio::ip::tcp::endpoint>();
-        }
-      }
-      if (!connected)
-      {
-        // do the full connection procedure
-        auto eps = asio::tcp::resolve(hostname, boost::lexical_cast<std::string>(port));
-        if (eps.size() == 0)
-          FC_THROW("Unable to resolve host '${host}'", ("host", hostname));
-
-        for (uint32_t i = 0; i < eps.size(); ++i)
-        {
-          try 
-          {
-            boost::system::error_code ec;
-            ilog("Attempting to connect to GNTP srvice");
-            asio::tcp::connect(*sock, eps[i]);
-            endpoint = eps[i];
-            connected = true;
-            break;
-          }
-          catch (const exception& er) 
-          {
-            ilog("Failed to connect to GNTP service: ${error_reprot}", 
-                  ("error_report", er.to_detail_string()) );
-            sock->close();
-          }
-          catch (...)
-          {
-            ilog("Failed to connect to GNTP service");
-            sock->close();
-          }
-        }
-      }
-      if (!connected)
-        FC_THROW("Unable to connect to any resolved endpoint for ${host}:${port}", 
-                  ("host", hostname)("port", port));
-      try
-      {
-        asio::ostream<boost::asio::ip::tcp::socket> write_stream(sock);
-        write_stream.write(message.c_str(), message.size());
-        write_stream.flush();
-        write_stream.close();
-      }
-      catch (exception& er)
-      {
-        FC_RETHROW_EXCEPTION(er, warn, "Caught an exception while sending data to GNTP service");
-      }
-      catch (...)
-      {
-        FC_THROW("Caught an exception while sending data to GNTP service");
-      }
-    }
-  } // end namespace detail
-
-  gntp_icon::gntp_icon(const char* buffer, size_t length) :
-    my(new detail::gntp_icon_impl(buffer, length))
-  {
-  }
-  gntp_icon::~gntp_icon()
-  {
-  }
-   
-  gntp_notifier::gntp_notifier(const std::string& host_to_notify /* = "127.0.0.1" */, uint16_t port /* = 23053 */,
-                               const optional<std::string>& password /* = optional<std::string>() */) :
-    my(new detail::gntp_notifier_impl(host_to_notify, port, password))
-  {
-  }
-
-  gntp_notifier::~gntp_notifier()
-  {
-  }
-
-  void gntp_notifier::set_application_name(std::string appName)
-  {
-    my->application_name = appName;
-  }
-  void gntp_notifier::set_application_icon(const gntp_icon_ptr& icon)
-  {
-    my->application_icon = icon;
-  }
-  void gntp_notifier::add_notification_type(const gntp_notification_type& notification_type)
-  {
-    my->notification_types.push_back(notification_type);
-  }
-
-  void gntp_notifier::register_notifications()
-  {
-    // this call will reset any errors
-    my->connection_failed = false;
-    my->is_registered = false;
-
-    std::ostringstream message;
-    std::set<gntp_icon_ptr> icons_used;
-
-    message << "GNTP/1.0 REGISTER NONE\r\n";
-    message << "Application-Name: " << my->application_name << "\r\n";
-    if (my->application_icon)
-    {
-      message << "Application-Icon: x-growl-resource://" << my->application_icon->my->_sha1_hash << "\r\n";
-      icons_used.insert(my->application_icon);
-    }
-
-    message << "Notifications-Count: " << my->notification_types.size() << "\r\n";
-    for (const gntp_notification_type& notification_type : my->notification_types)
-    {
-      message << "\r\n";
-      message << "Notification-Name: " << notification_type.name << "\r\n";
-      if (!notification_type.display_name.empty())
-        message << "Notification-Display-Name: " << notification_type.display_name << "\r\n";
-      if (notification_type.icon)
-      {
-        message << "Notification-Icon: x-growl-resource://" << notification_type.icon->my->_sha1_hash << "\r\n";
-        icons_used.insert(notification_type.icon);
-      }
-      message << "Notification-Enabled: " << (notification_type.enabled ? "True" : "False") << "\r\n";
-    }
-    if (!icons_used.empty())
-    {
-      message << "\r\n";
-      for (const gntp_icon_ptr& icon : icons_used)
-      {
-        message << "Identifier: " << icon->my->_sha1_hash << "\r\n";
-        message << "Length: " << icon->my->_icon_bytes.size() << "\r\n";
-        message << "\r\n";
-        message << icon->my->_icon_bytes;
-        message << "\r\n";
-      }
-    }
-
-    message << "\r\n\r\n";
-    try
-    {
-      my->send_gntp_message(message.str());
-      my->is_registered = true;
-    }
-    catch (const exception&)
-    {
-      my->connection_failed = true;
-    }
-  }
-  gntp_guid gntp_notifier::send_notification(std::string name, std::string title, std::string text, 
-                                             const gntp_icon_ptr& icon, optional<gntp_guid> coalescingId /* = optional<gntp_guid>() */)
-  {
-    if (my->connection_failed)
-      return gntp_guid();
-    if (!my->is_registered)
-      return gntp_guid();
-
-    gntp_guid notification_id;
-    rand_pseudo_bytes(notification_id.data(), 20);
-
-    std::ostringstream message;
-    message << "GNTP/1.0 NOTIFY NONE";
-    if (my->password)
-    {
-      char salt[16];
-      rand_pseudo_bytes(salt, sizeof(salt));
-      std::string salted_password = *my->password + std::string(salt, 16);
-      sha256 key = sha256::hash(salted_password);
-      sha256 keyhash = sha256::hash(key.data(), 32);
-      message << " SHA256:" << boost::to_upper_copy(to_hex(keyhash.data(), 32)) << "." << boost::to_upper_copy(to_hex(salt, sizeof(salt)));
-    }
-    message << "\r\n";
-    message << "Application-Name: " << my->application_name << "\r\n";
-    message << "Notification-Name: " << name << "\r\n";
-    message << "Notification-ID: " << notification_id.str() << "\r\n";
-    message << "Notification-Coalescing-ID: " << (coalescingId ? coalescingId->str() : notification_id.str()) << "\r\n";
-    message << "Notification-Title: " << title << "\r\n";
-    message << "Notification-Text: " << text << "\r\n";
-    if (icon)
-      message << "Notification-Icon: x-growl-resource://" << icon->my->_sha1_hash << "\r\n";
-      
-    if (icon)
-    {
-      message << "\r\n";
-      message << "Identifier: " << icon->my->_sha1_hash << "\r\n";
-      message << "Length: " << icon->my->_icon_bytes.size() << "\r\n";
-      message << "\r\n";
-      message << icon->my->_icon_bytes;
-      message << "\r\n";
-    }
-    message << "\r\n\r\n";
-    my->send_gntp_message(message.str());
-    return notification_id;
-  }
-
-} // namespace fc
\ No newline at end of file

From 25d7b3055f9cec988632ea920ef0cdf103ee37b0 Mon Sep 17 00:00:00 2001
From: oxarbitrage <oxarbitrage@gmail.com>
Date: Fri, 17 Mar 2017 18:31:45 -0300
Subject: [PATCH 088/108] struct range_proof_info change int to int64_t

https://github.com/bitshares/bitshares-core/issues/160
---
 include/fc/crypto/elliptic.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/fc/crypto/elliptic.hpp b/include/fc/crypto/elliptic.hpp
index dd60da7..7d3046f 100644
--- a/include/fc/crypto/elliptic.hpp
+++ b/include/fc/crypto/elliptic.hpp
@@ -218,8 +218,8 @@ namespace fc {
 
      struct range_proof_info
      {
-         int          exp;
-         int          mantissa;
+         int64_t      exp;
+         int64_t      mantissa;
          uint64_t     min_value;
          uint64_t     max_value;
      };

From 9d408aa53267834542279490eac4c25878107967 Mon Sep 17 00:00:00 2001
From: Eric Frias <efrias@syncad.com>
Date: Wed, 16 Nov 2016 14:47:30 -0500
Subject: [PATCH 089/108] Fix serialization of enums to use variable-length
 integerd

---
 include/fc/io/raw.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/fc/io/raw.hpp b/include/fc/io/raw.hpp
index bc5cd22..46dcf4b 100644
--- a/include/fc/io/raw.hpp
+++ b/include/fc/io/raw.hpp
@@ -324,13 +324,13 @@ namespace fc {
       struct if_enum<fc::true_type> {
         template<typename Stream, typename T>
         static inline void pack( Stream& s, const T& v ) {
-          fc::raw::pack(s, (int64_t)v);
+          fc::raw::pack(s, signed_int((int32_t)v));
         }
         template<typename Stream, typename T>
         static inline void unpack( Stream& s, T& v ) {
-          int64_t temp;
+          signed_int temp;
           fc::raw::unpack(s, temp);
-          v = (T)temp;
+          v = (T)temp.value;
         }
       };
 

From fa63cd799f9c33828f89e862fc34e02a545b26c6 Mon Sep 17 00:00:00 2001
From: Michael Vandeberg <vandeberg@steemit.com>
Date: Mon, 10 Apr 2017 11:12:24 -0400
Subject: [PATCH 090/108] Responses contain jsonrpc field and increased
 readability of errors #13

---
 include/fc/rpc/state.hpp  | 5 ++++-
 src/exception.cpp         | 9 +++++----
 src/rpc/websocket_api.cpp | 5 +++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/include/fc/rpc/state.hpp b/include/fc/rpc/state.hpp
index 3c36bcf..e031530 100644
--- a/include/fc/rpc/state.hpp
+++ b/include/fc/rpc/state.hpp
@@ -23,7 +23,10 @@ namespace fc { namespace rpc {
       response(){}
       response( int64_t i, fc::variant r ):id(i),result(r){}
       response( int64_t i, error_object r ):id(i),error(r){}
+      response( int64_t i, fc::variant r, string j ):id(i),jsonrpc(j),result(r){}
+      response( int64_t i, error_object r, string j ):id(i),jsonrpc(j),error(r){}
       int64_t                id = 0;
+      optional<fc::string>   jsonrpc;
       optional<fc::variant>  result;
       optional<error_object> error;
    };
@@ -57,4 +60,4 @@ namespace fc { namespace rpc {
 
 FC_REFLECT( fc::rpc::request, (id)(method)(params) );
 FC_REFLECT( fc::rpc::error_object, (code)(message)(data) )
-FC_REFLECT( fc::rpc::response, (id)(result)(error) )
+FC_REFLECT( fc::rpc::response, (id)(jsonrpc)(result)(error) )
diff --git a/src/exception.cpp b/src/exception.cpp
index fef482a..7da6bea 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -156,7 +156,7 @@ namespace fc
     *   and other information that is generally only useful for
     *   developers.
     */
-   string exception::to_detail_string( log_level ll  )const
+   string exception::to_detail_string( log_level ll )const
    {
       fc::stringstream ss;
       ss << variant(my->_code).as_string() <<" " << my->_name << ": " <<my->_what<<"\n";
@@ -174,13 +174,14 @@ namespace fc
    /**
     *   Generates a user-friendly error report.
     */
-   string exception::to_string( log_level ll   )const
+   string exception::to_string( log_level ll )const
    {
       fc::stringstream ss;
-      ss << what() << " (" << variant(my->_code).as_string() <<")\n";
+      ss << what() << ":";
       for( auto itr = my->_elog.begin(); itr != my->_elog.end(); ++itr )
       {
-         ss << fc::format_string( itr->get_format(), itr->get_data() ) <<"\n";
+         if( itr->get_format().size() )
+            ss << " " << fc::format_string( itr->get_format(), itr->get_data() );
    //      ss << "    " << itr->get_context().to_string() <<"\n";
       }
       return ss.str();
diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
index 5f86474..fe95d8c 100644
--- a/src/rpc/websocket_api.cpp
+++ b/src/rpc/websocket_api.cpp
@@ -90,6 +90,7 @@ std::string websocket_api_connection::on_message(
    {
       auto var = fc::json::from_string(message);
       const auto& var_obj = var.get_object();
+
       if( var_obj.contains( "method" ) )
       {
          auto call = var.as<fc::rpc::request>();
@@ -115,7 +116,7 @@ std::string websocket_api_connection::on_message(
 
                if( call.id )
                {
-                  auto reply = fc::json::to_string( response( *call.id, result ) );
+                  auto reply = fc::json::to_string( response( *call.id, result, "2.0" ) );
                   if( send_message )
                      _connection.send_message( reply );
                   return reply;
@@ -132,7 +133,7 @@ std::string websocket_api_connection::on_message(
          }
          if( optexcept ) {
 
-               auto reply = fc::json::to_string( response( *call.id,  error_object{ 1, optexcept->to_detail_string(), fc::variant(*optexcept)}  ) );
+               auto reply = fc::json::to_string( response( *call.id,  error_object{ 1, optexcept->to_string(), fc::variant(*optexcept)}, "2.0" ) );
                if( send_message )
                   _connection.send_message( reply );
 

From 908762d687eccab019403189fd1d95502fb75c89 Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nat.hourt@gmail.com>
Date: Tue, 25 Apr 2017 15:39:42 -0500
Subject: [PATCH 091/108] ...Fix build?

---
 include/fc/static_variant.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp
index 9aab790..228eb65 100644
--- a/include/fc/static_variant.hpp
+++ b/include/fc/static_variant.hpp
@@ -382,5 +382,5 @@ struct visitor {
       s.visit( to_static_variant(ar[1]) );
    }
 
-  template<typename... T> struct get_typename<T...>  { static const char* name()   { return typeid(static_variant<T...>).name();   } };
+  template<typename... T> struct get_typename<static_variant<T...>>  { static const char* name()   { return typeid(static_variant<T...>).name();   } };
 } // namespace fc

From fee06a4c75d3215f9b502f8145383005bdda2c80 Mon Sep 17 00:00:00 2001
From: Nathan Hourt <nat.hourt@gmail.com>
Date: Tue, 25 Apr 2017 15:50:56 -0500
Subject: [PATCH 092/108] Add OpenSSL 1.1.0 support

These changes should add support for openssl 1.1.0 while maintaining
compatibility with 1.0.2
---
 src/crypto/base58.cpp | 142 ++++++++++++++++++++++--------------------
 src/crypto/dh.cpp     |  47 +++++++++++++-
 2 files changed, 119 insertions(+), 70 deletions(-)

diff --git a/src/crypto/base58.cpp b/src/crypto/base58.cpp
index e1d5d33..46c9adc 100644
--- a/src/crypto/base58.cpp
+++ b/src/crypto/base58.cpp
@@ -66,74 +66,71 @@ class CAutoBN_CTX
 
 
 /** C++ wrapper for BIGNUM (OpenSSL bignum) */
-class CBigNum : public BIGNUM
+class CBigNum
 {
+    BIGNUM* bn;
 public:
     CBigNum()
-    {
-        BN_init(this);
-    }
+       : bn(BN_new()) {}
 
     CBigNum(const CBigNum& b)
+       : CBigNum()
     {
-        BN_init(this);
-        if (!BN_copy(this, &b))
+        if (!BN_copy(bn, b.bn))
         {
-            BN_clear_free(this);
+            BN_clear_free(bn);
             throw bignum_error("CBigNum::CBigNum(const CBigNum&) : BN_copy failed");
         }
     }
 
     CBigNum& operator=(const CBigNum& b)
     {
-        if (!BN_copy(this, &b))
+        if (!BN_copy(bn, b.bn))
             throw bignum_error("CBigNum::operator= : BN_copy failed");
         return (*this);
     }
 
     ~CBigNum()
     {
-        BN_clear_free(this);
+        BN_clear_free(bn);
     }
 
     //CBigNum(char n) is not portable.  Use 'signed char' or 'unsigned char'.
-    CBigNum(signed char n)      { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(short n)            { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(int n)              { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
-    //CBigNum(long n)             { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(int64_t n)          { BN_init(this); setint64(n); }
-    CBigNum(unsigned char n)    { BN_init(this); setulong(n); }
-    CBigNum(unsigned short n)   { BN_init(this); setulong(n); }
-    CBigNum(unsigned int n)     { BN_init(this); setulong(n); }
-    //CBigNum(unsigned long n)    { BN_init(this); setulong(n); }
-    CBigNum(uint64_t n)           { BN_init(this); setuint64(n); }
+    CBigNum(signed char n)      :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(short n)            :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(int n)              :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(int64_t n)          :CBigNum() { setint64(n); }
+    CBigNum(unsigned char n)    :CBigNum() { setulong(n); }
+    CBigNum(unsigned short n)   :CBigNum() { setulong(n); }
+    CBigNum(unsigned int n)     :CBigNum() { setulong(n); }
+    CBigNum(uint64_t n)         :CBigNum() { setuint64(n); }
 
     explicit CBigNum(const std::vector<unsigned char>& vch)
+       : CBigNum()
     {
-        BN_init(this);
         setvch(vch);
     }
 
     void setulong(unsigned long n)
     {
-        if (!BN_set_word(this, n))
+        if (!BN_set_word(bn, n))
             throw bignum_error("CBigNum conversion from unsigned long : BN_set_word failed");
     }
 
     unsigned long getulong() const
     {
-        return BN_get_word(this);
+        return BN_get_word(bn);
     }
 
     unsigned int getuint() const
     {
-        return BN_get_word(this);
+        return BN_get_word(bn);
     }
 
     int getint() const
     {
-        unsigned long n = BN_get_word(this);
-        if (!BN_is_negative(this))
+        unsigned long n = BN_get_word(bn);
+        if (!BN_is_negative(bn))
             return (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::max() : n);
         else
             return (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::min() : -(int)n);
@@ -171,7 +168,7 @@ class CBigNum : public BIGNUM
         pch[1] = (nSize >> 16) & 0xff;
         pch[2] = (nSize >> 8) & 0xff;
         pch[3] = (nSize) & 0xff;
-        BN_mpi2bn(pch, p - pch, this);
+        BN_mpi2bn(pch, p - pch, bn);
     }
 
     void setuint64(uint64_t n)
@@ -198,7 +195,7 @@ class CBigNum : public BIGNUM
         pch[1] = (nSize >> 16) & 0xff;
         pch[2] = (nSize >> 8) & 0xff;
         pch[3] = (nSize) & 0xff;
-        BN_mpi2bn(pch, p - pch, this);
+        BN_mpi2bn(pch, p - pch, bn);
     }
 
 
@@ -214,16 +211,16 @@ class CBigNum : public BIGNUM
         vch2[3] = (nSize >> 0) & 0xff;
         // swap data to big endian
         reverse_copy(vch.begin(), vch.end(), vch2.begin() + 4);
-        BN_mpi2bn(&vch2[0], vch2.size(), this);
+        BN_mpi2bn(&vch2[0], vch2.size(), bn);
     }
 
     std::vector<unsigned char> getvch() const
     {
-        unsigned int nSize = BN_bn2mpi(this, NULL);
+        unsigned int nSize = BN_bn2mpi(bn, NULL);
         if (nSize <= 4)
             return std::vector<unsigned char>();
         std::vector<unsigned char> vch(nSize);
-        BN_bn2mpi(this, &vch[0]);
+        BN_bn2mpi(bn, &vch[0]);
         vch.erase(vch.begin(), vch.begin() + 4);
         reverse(vch.begin(), vch.end());
         return vch;
@@ -237,16 +234,16 @@ class CBigNum : public BIGNUM
         if (nSize >= 1) vch[4] = (nCompact >> 16) & 0xff;
         if (nSize >= 2) vch[5] = (nCompact >> 8) & 0xff;
         if (nSize >= 3) vch[6] = (nCompact >> 0) & 0xff;
-        BN_mpi2bn(&vch[0], vch.size(), this);
+        BN_mpi2bn(&vch[0], vch.size(), bn);
         return *this;
     }
 
     unsigned int GetCompact() const
     {
-        unsigned int nSize = BN_bn2mpi(this, NULL);
+        unsigned int nSize = BN_bn2mpi(bn, NULL);
         std::vector<unsigned char> vch(nSize);
         nSize -= 4;
-        BN_bn2mpi(this, &vch[0]);
+        BN_bn2mpi(bn, &vch[0]);
         unsigned int nCompact = nSize << 24;
         if (nSize >= 1) nCompact |= (vch[4] << 16);
         if (nSize >= 2) nCompact |= (vch[5] << 8);
@@ -281,7 +278,7 @@ class CBigNum : public BIGNUM
             *this += n;
         }
         if (fNegative)
-            *this = 0 - *this;
+            BN_set_negative(bn, 1);
     }
 
     std::string ToString(int nBase=10) const
@@ -291,20 +288,20 @@ class CBigNum : public BIGNUM
         CBigNum bn0 = 0;
         std::string str;
         CBigNum bn = *this;
-        BN_set_negative(&bn, false);
+        BN_set_negative(bn.bn, false);
         CBigNum dv;
         CBigNum rem;
-        if (BN_cmp(&bn, &bn0) == 0)
+        if (BN_cmp(bn.bn, bn0.bn) == 0)
             return "0";
-        while (BN_cmp(&bn, &bn0) > 0)
+        while (BN_cmp(bn.bn, bn0.bn) > 0)
         {
-            if (!BN_div(&dv, &rem, &bn, &bnBase, pctx))
+            if (!BN_div(dv.bn, rem.bn, bn.bn, bnBase.bn, pctx))
                 throw bignum_error("CBigNum::ToString() : BN_div failed");
             bn = dv;
             unsigned int c = rem.getulong();
             str += "0123456789abcdef"[c];
         }
-        if (BN_is_negative(this))
+        if (BN_is_negative(this->bn))
             str += "-";
         reverse(str.begin(), str.end());
         return str;
@@ -319,45 +316,50 @@ class CBigNum : public BIGNUM
 
     bool operator!() const
     {
-        return BN_is_zero(this);
+        return BN_is_zero(bn);
     }
 
     CBigNum& operator+=(const CBigNum& b)
     {
-        if (!BN_add(this, this, &b))
+        if (!BN_add(bn, bn, b.bn))
             throw bignum_error("CBigNum::operator+= : BN_add failed");
         return *this;
     }
 
     CBigNum& operator-=(const CBigNum& b)
     {
-        *this = *this - b;
+        if (!BN_sub(bn, bn, b.bn))
+            throw bignum_error("CBigNum::operator-= : BN_sub failed");
         return *this;
     }
 
     CBigNum& operator*=(const CBigNum& b)
     {
         CAutoBN_CTX pctx;
-        if (!BN_mul(this, this, &b, pctx))
+        if (!BN_mul(bn, bn, b.bn, pctx))
             throw bignum_error("CBigNum::operator*= : BN_mul failed");
         return *this;
     }
 
     CBigNum& operator/=(const CBigNum& b)
     {
-        *this = *this / b;
+        CAutoBN_CTX pctx;
+        if (!BN_div(bn, NULL, bn, b.bn, pctx))
+            throw bignum_error("CBigNum::operator/= : BN_div failed");
         return *this;
     }
 
     CBigNum& operator%=(const CBigNum& b)
     {
-        *this = *this % b;
+        CAutoBN_CTX pctx;
+        if (!BN_div(NULL, bn, bn, b.bn, pctx))
+            throw bignum_error("CBigNum::operator%= : BN_div failed");
         return *this;
     }
 
     CBigNum& operator<<=(unsigned int shift)
     {
-        if (!BN_lshift(this, this, shift))
+        if (!BN_lshift(bn, bn, shift))
             throw bignum_error("CBigNum:operator<<= : BN_lshift failed");
         return *this;
     }
@@ -368,13 +370,13 @@ class CBigNum : public BIGNUM
         //   if built on ubuntu 9.04 or 9.10, probably depends on version of openssl
         CBigNum a = 1;
         a <<= shift;
-        if (BN_cmp(&a, this) > 0)
+        if (BN_cmp(a.bn, bn) > 0)
         {
             *this = 0;
             return *this;
         }
 
-        if (!BN_rshift(this, this, shift))
+        if (!BN_rshift(bn, bn, shift))
             throw bignum_error("CBigNum:operator>>= : BN_rshift failed");
         return *this;
     }
@@ -383,7 +385,7 @@ class CBigNum : public BIGNUM
     CBigNum& operator++()
     {
         // prefix operator
-        if (!BN_add(this, this, BN_value_one()))
+        if (!BN_add(bn, bn, BN_value_one()))
             throw bignum_error("CBigNum::operator++ : BN_add failed");
         return *this;
     }
@@ -400,7 +402,7 @@ class CBigNum : public BIGNUM
     {
         // prefix operator
         CBigNum r;
-        if (!BN_sub(&r, this, BN_value_one()))
+        if (!BN_sub(r.bn, bn, BN_value_one()))
             throw bignum_error("CBigNum::operator-- : BN_sub failed");
         *this = r;
         return *this;
@@ -414,10 +416,12 @@ class CBigNum : public BIGNUM
         return ret;
     }
 
-
-    friend inline const CBigNum operator-(const CBigNum& a, const CBigNum& b);
-    friend inline const CBigNum operator/(const CBigNum& a, const CBigNum& b);
-    friend inline const CBigNum operator%(const CBigNum& a, const CBigNum& b);
+    const BIGNUM* to_bignum() const {
+       return bn;
+    }
+    BIGNUM* to_bignum() {
+       return bn;
+    }
 };
 
 
@@ -425,7 +429,7 @@ class CBigNum : public BIGNUM
 inline const CBigNum operator+(const CBigNum& a, const CBigNum& b)
 {
     CBigNum r;
-    if (!BN_add(&r, &a, &b))
+    if (!BN_add(r.to_bignum(), a.to_bignum(), b.to_bignum()))
         throw bignum_error("CBigNum::operator+ : BN_add failed");
     return r;
 }
@@ -433,7 +437,7 @@ inline const CBigNum operator+(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator-(const CBigNum& a, const CBigNum& b)
 {
     CBigNum r;
-    if (!BN_sub(&r, &a, &b))
+    if (!BN_sub(r.to_bignum(), a.to_bignum(), b.to_bignum()))
         throw bignum_error("CBigNum::operator- : BN_sub failed");
     return r;
 }
@@ -441,7 +445,7 @@ inline const CBigNum operator-(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator-(const CBigNum& a)
 {
     CBigNum r(a);
-    BN_set_negative(&r, !BN_is_negative(&r));
+    BN_set_negative(r.to_bignum(), !BN_is_negative(r.to_bignum()));
     return r;
 }
 
@@ -449,7 +453,7 @@ inline const CBigNum operator*(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_mul(&r, &a, &b, pctx))
+    if (!BN_mul(r.to_bignum(), a.to_bignum(), b.to_bignum(), pctx))
         throw bignum_error("CBigNum::operator* : BN_mul failed");
     return r;
 }
@@ -458,7 +462,7 @@ inline const CBigNum operator/(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_div(&r, NULL, &a, &b, pctx))
+    if (!BN_div(r.to_bignum(), NULL, a.to_bignum(), b.to_bignum(), pctx))
         throw bignum_error("CBigNum::operator/ : BN_div failed");
     return r;
 }
@@ -467,7 +471,7 @@ inline const CBigNum operator%(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_mod(&r, &a, &b, pctx))
+    if (!BN_mod(r.to_bignum(), a.to_bignum(), b.to_bignum(), pctx))
         throw bignum_error("CBigNum::operator% : BN_div failed");
     return r;
 }
@@ -475,7 +479,7 @@ inline const CBigNum operator%(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator<<(const CBigNum& a, unsigned int shift)
 {
     CBigNum r;
-    if (!BN_lshift(&r, &a, shift))
+    if (!BN_lshift(r.to_bignum(), a.to_bignum(), shift))
         throw bignum_error("CBigNum:operator<< : BN_lshift failed");
     return r;
 }
@@ -487,12 +491,12 @@ inline const CBigNum operator>>(const CBigNum& a, unsigned int shift)
     return r;
 }
 
-inline bool operator==(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) == 0); }
-inline bool operator!=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) != 0); }
-inline bool operator<=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) <= 0); }
-inline bool operator>=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) >= 0); }
-inline bool operator<(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(&a, &b) < 0); }
-inline bool operator>(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(&a, &b) > 0); }
+inline bool operator==(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) == 0); }
+inline bool operator!=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) != 0); }
+inline bool operator<=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) <= 0); }
+inline bool operator>=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) >= 0); }
+inline bool operator<(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(a.to_bignum(), b.to_bignum()) < 0); }
+inline bool operator>(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(a.to_bignum(), b.to_bignum()) > 0); }
 
 
 static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
@@ -522,7 +526,7 @@ inline std::string EncodeBase58(const unsigned char* pbegin, const unsigned char
     CBigNum rem;
     while (bn > bn0)
     {
-        if (!BN_div(&dv, &rem, &bn, &bn58, pctx))
+        if (!BN_div(dv.to_bignum(), rem.to_bignum(), bn.to_bignum(), bn58.to_bignum(), pctx))
             throw bignum_error("EncodeBase58 : BN_div failed");
         bn = dv;
         unsigned int c = rem.getulong();
@@ -572,7 +576,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet)
             break;
         }
         bnChar.setulong(p1 - pszBase58);
-        if (!BN_mul(&bn, &bn, &bn58, pctx))
+        if (!BN_mul(bn.to_bignum(), bn.to_bignum(), bn58.to_bignum(), pctx))
             throw bignum_error("DecodeBase58 : BN_mul failed");
         bn += bnChar;
     }
diff --git a/src/crypto/dh.cpp b/src/crypto/dh.cpp
index cbd7dcc..e7f6c59 100644
--- a/src/crypto/dh.cpp
+++ b/src/crypto/dh.cpp
@@ -1,6 +1,9 @@
 #include <fc/crypto/dh.hpp>
 #include <openssl/dh.h>
 
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#endif
+
 namespace fc {
     SSL_TYPE(ssl_dh, DH, DH_free)
 
@@ -12,10 +15,19 @@ namespace fc {
 
    bool diffie_hellman::generate_params( int s, uint8_t g )
    {
-        ssl_dh dh = DH_generate_parameters( s, g, NULL, NULL );
+        ssl_dh dh;
+        DH_generate_parameters_ex(dh.obj, s, g, NULL);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        ssl_bignum bn_p;
+        DH_get0_pqg(dh.obj, (const BIGNUM**)&bn_p.obj, NULL, NULL);
+        p.resize( BN_num_bytes( bn_p ) );
+        if( p.size() )
+            BN_bn2bin( bn_p, (unsigned char*)&p.front()  );
+#else
         p.resize( BN_num_bytes( dh->p ) );
         if( p.size() )
             BN_bn2bin( dh->p, (unsigned char*)&p.front()  );
+#endif
         this->g = g;
         return fc::validate( dh, valid );
    }
@@ -25,8 +37,14 @@ namespace fc {
         if( !p.size() ) 
             return valid = false;
         ssl_dh dh = DH_new();
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        const auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
+        const auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
+#else
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+#endif
         return fc::validate( dh, valid );
    }
 
@@ -35,8 +53,14 @@ namespace fc {
         if( !p.size() ) 
             return valid = false;
         ssl_dh dh = DH_new();
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        const auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
+        const auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
+#else
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+#endif
 
         if( !fc::validate( dh, valid ) )
         {
@@ -44,21 +68,42 @@ namespace fc {
         }
         DH_generate_key(dh);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        ssl_bignum bn_pub_key;
+        ssl_bignum bn_priv_key;
+        DH_get0_key(dh.obj, (const BIGNUM**)&bn_pub_key.obj, (const BIGNUM**)&bn_priv_key.obj);
+        pub_key.resize( BN_num_bytes( bn_pub_key ) );
+        priv_key.resize( BN_num_bytes( bn_priv_key ) );
+        if( pub_key.size() )
+            BN_bn2bin( bn_pub_key.obj, (unsigned char*)&pub_key.front()  );
+        if( priv_key.size() )
+            BN_bn2bin( bn_priv_key.obj, (unsigned char*)&priv_key.front()  );
+#else
         pub_key.resize( BN_num_bytes( dh->pub_key ) );
         priv_key.resize( BN_num_bytes( dh->priv_key ) );
         if( pub_key.size() )
             BN_bn2bin( dh->pub_key, (unsigned char*)&pub_key.front()  );
         if( priv_key.size() )
             BN_bn2bin( dh->priv_key, (unsigned char*)&priv_key.front()  );
+#endif
 
         return true;
    }
    bool diffie_hellman::compute_shared_key( const char* buf, uint32_t s ) {
         ssl_dh dh = DH_new();
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
+        auto bn_pub_key = BN_bin2bn( (unsigned char*)&pub_key.front(), pub_key.size(), NULL );
+        auto bn_priv_key = BN_bin2bn( (unsigned char*)&priv_key.front(), priv_key.size(), NULL );
+        auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
+        DH_set0_key(dh.obj, bn_pub_key, bn_priv_key);
+#else
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->pub_key = BN_bin2bn( (unsigned char*)&pub_key.front(), pub_key.size(), NULL );
         dh->priv_key = BN_bin2bn( (unsigned char*)&priv_key.front(), priv_key.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+#endif
 
         int check;
         DH_check(dh,&check);

From 6d386e442b57f4da6099ebd934e071a73d46f398 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Tue, 25 Apr 2017 20:22:31 -0500
Subject: [PATCH 093/108] Revert "...Fix build?"

This reverts commit 908762d687eccab019403189fd1d95502fb75c89.
---
 include/fc/static_variant.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp
index 228eb65..9aab790 100644
--- a/include/fc/static_variant.hpp
+++ b/include/fc/static_variant.hpp
@@ -382,5 +382,5 @@ struct visitor {
       s.visit( to_static_variant(ar[1]) );
    }
 
-  template<typename... T> struct get_typename<static_variant<T...>>  { static const char* name()   { return typeid(static_variant<T...>).name();   } };
+  template<typename... T> struct get_typename<T...>  { static const char* name()   { return typeid(static_variant<T...>).name();   } };
 } // namespace fc

From 91af0e7edbec0e37d38efff78c5644f9ba8aedd7 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Wed, 26 Apr 2017 11:58:32 -0500
Subject: [PATCH 094/108] Fix compilation on Clang 4+

---
 CMakeLists.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebca16e..41da2d4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -306,6 +306,12 @@ ELSE()
       target_compile_options(fc PUBLIC ${CPP_STANDARD} -Wall -fnon-call-exceptions)
     endif()
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -Wall -fnon-call-exceptions")
+
+    if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
+        if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3 )
+            set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" )
+        endif()
+    endif()
   ENDIF()
 ENDIF()
 

From 453b3de77efeed3d159c67b9eaa9e0595e0f9091 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Wed, 26 Apr 2017 12:20:58 -0500
Subject: [PATCH 095/108] Better fix for Clang 4+

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41da2d4..cd537eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,7 +308,7 @@ ELSE()
     SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD} -Wall -fnon-call-exceptions")
 
     if( "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" )
-        if( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3 )
+        if( CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 4.0.0 OR CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.0.0 )
             set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-invalid-partial-specialization" )
         endif()
     endif()

From 0c25cb568fcc22908bd5fc194f9c0666c7aecccb Mon Sep 17 00:00:00 2001
From: kinglaw <58291@qq.com>
Date: Thu, 1 Jun 2017 13:03:02 +0800
Subject: [PATCH 096/108] In order to pass compile in vs2013, fixed: removed
 equihash from the cmakelists.txt. Fix the inconsistencies of the template
 functions "from_variant" ,"unpack" and definitions that processes flat_map.
 Signed-off-by: kinglaw <58291@qq.com>

---
 CMakeLists.txt                    | 6 +-----
 include/fc/container/flat_fwd.hpp | 4 ++--
 include/fc/variant.hpp            | 4 ++--
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd537eb..62b579d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,6 @@ set( fc_sources
      src/crypto/dh.cpp
      src/crypto/blowfish.cpp
      src/crypto/elliptic_common.cpp
-     src/crypto/equihash.cpp
      ${ECC_REST}
      src/crypto/elliptic_${ECC_IMPL}.cpp
      src/crypto/rand.cpp
@@ -251,7 +250,6 @@ list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp")
 list(APPEND sources ${fc_headers})
 
 add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL )
-add_subdirectory( vendor/equihash )
 
 setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC )
 install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include )
@@ -373,14 +371,13 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/cyoencode-1.0.2/src
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/equihash
   )
 
 #target_link_libraries( fc PUBLIC ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} equihash ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
 
 if(MSVC)
   set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
@@ -396,7 +393,6 @@ ENDIF(MSVC)
 ENDIF()
 
 include_directories( vendor/websocketpp )
-include_directories( vendor/equihash )
 
 add_subdirectory(tests)
 
diff --git a/include/fc/container/flat_fwd.hpp b/include/fc/container/flat_fwd.hpp
index 98dd954..d56323a 100644
--- a/include/fc/container/flat_fwd.hpp
+++ b/include/fc/container/flat_fwd.hpp
@@ -16,8 +16,8 @@ namespace fc {
        void unpack( Stream& s, flat_set<T>& value );
        template<typename Stream, typename K, typename... V>
        void pack( Stream& s, const flat_map<K,V...>& value );
-       template<typename Stream, typename K, typename... V>
-       void unpack( Stream& s, flat_map<K,V...>& value ) ;
+       template<typename Stream, typename K, typename V, typename... A>
+       void unpack(Stream& s, flat_map<K, V, A...>& value);
 
 
        template<typename Stream, typename T, typename A>
diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp
index 092de0a..c5ddf0d 100644
--- a/include/fc/variant.hpp
+++ b/include/fc/variant.hpp
@@ -90,8 +90,8 @@ namespace fc
 
    template<typename K, typename... T>
    void to_variant( const fc::flat_map<K,T...>& var,  variant& vo );
-   template<typename K, typename... T>
-   void from_variant( const variant& var, fc::flat_map<K,T...>& vo );
+   template<typename K, typename T, typename... A>
+   void from_variant(const variant& var, flat_map<K, T, A...>& vo);
 
    template<typename K, typename T>
    void to_variant( const std::map<K,T>& var,  variant& vo );

From 680731ef1b8cf11b0749b739442363224a749eac Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Thu, 1 Jun 2017 16:11:35 -0500
Subject: [PATCH 097/108] Remove equihash

---
 CMakeLists.txt                                |   6 +-
 include/fc/crypto/equihash.hpp                |  22 -
 src/crypto/equihash.cpp                       |  57 ---
 vendor/equihash/CMakeLists.txt                |  19 -
 .../equihash/include/equihash/blake2-config.h |  72 ---
 .../equihash/include/equihash/blake2-impl.h   | 136 -----
 vendor/equihash/include/equihash/blake2.h     | 157 ------
 .../include/equihash/blake2b-load-sse2.h      |  68 ---
 .../include/equihash/blake2b-load-sse41.h     | 402 ---------------
 .../equihash/include/equihash/blake2b-round.h | 170 -------
 vendor/equihash/include/equihash/pow.hpp      | 120 -----
 vendor/equihash/src/blake2b.c                 | 469 ------------------
 vendor/equihash/src/pow.cpp                   | 415 ----------------
 13 files changed, 1 insertion(+), 2112 deletions(-)
 delete mode 100644 include/fc/crypto/equihash.hpp
 delete mode 100644 src/crypto/equihash.cpp
 delete mode 100644 vendor/equihash/CMakeLists.txt
 delete mode 100644 vendor/equihash/include/equihash/blake2-config.h
 delete mode 100644 vendor/equihash/include/equihash/blake2-impl.h
 delete mode 100644 vendor/equihash/include/equihash/blake2.h
 delete mode 100644 vendor/equihash/include/equihash/blake2b-load-sse2.h
 delete mode 100644 vendor/equihash/include/equihash/blake2b-load-sse41.h
 delete mode 100644 vendor/equihash/include/equihash/blake2b-round.h
 delete mode 100644 vendor/equihash/include/equihash/pow.hpp
 delete mode 100644 vendor/equihash/src/blake2b.c
 delete mode 100644 vendor/equihash/src/pow.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd537eb..62b579d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -221,7 +221,6 @@ set( fc_sources
      src/crypto/dh.cpp
      src/crypto/blowfish.cpp
      src/crypto/elliptic_common.cpp
-     src/crypto/equihash.cpp
      ${ECC_REST}
      src/crypto/elliptic_${ECC_IMPL}.cpp
      src/crypto/rand.cpp
@@ -251,7 +250,6 @@ list(APPEND sources "${CMAKE_CURRENT_BINARY_DIR}/git_revision.cpp")
 list(APPEND sources ${fc_headers})
 
 add_subdirectory( vendor/websocketpp EXCLUDE_FROM_ALL )
-add_subdirectory( vendor/equihash )
 
 setup_library( fc SOURCES ${sources} LIBRARY_TYPE STATIC )
 install( DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" DESTINATION include )
@@ -373,14 +371,13 @@ target_include_directories(fc
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/cyoencode-1.0.2/src
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/equihash
   )
 
 #target_link_libraries( fc PUBLIC ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${ECC_LIB} )
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} equihash ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
 
 if(MSVC)
   set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
@@ -396,7 +393,6 @@ ENDIF(MSVC)
 ENDIF()
 
 include_directories( vendor/websocketpp )
-include_directories( vendor/equihash )
 
 add_subdirectory(tests)
 
diff --git a/include/fc/crypto/equihash.hpp b/include/fc/crypto/equihash.hpp
deleted file mode 100644
index d37269e..0000000
--- a/include/fc/crypto/equihash.hpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-#include <fc/crypto/sha256.hpp>
-#include <fc/vector.hpp>
-
-namespace fc { namespace equihash {
-
-   struct proof
-   {
-      uint32_t n;
-      uint32_t k;
-      sha256   seed;
-      std::vector< uint32_t > inputs;
-
-      bool is_valid( bool test_canonical_order = false, bool test_intermediate_zeros = false ) const;
-      void canonize_indexes();
-
-      static proof hash( uint32_t n, uint32_t k, sha256 seed );
-   };
-
-} } // fc
-
-FC_REFLECT( fc::equihash::proof, (n)(k)(seed)(inputs) )
diff --git a/src/crypto/equihash.cpp b/src/crypto/equihash.cpp
deleted file mode 100644
index d6f40bf..0000000
--- a/src/crypto/equihash.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-#include <equihash/pow.hpp>
-
-#include <fc/crypto/equihash.hpp>
-
-#define EQUIHASH_NONCE 2
-
-namespace fc { namespace equihash {
-
-   _POW::Seed sha_to_seed( sha256 seed )
-   {
-      _POW::Seed new_seed;
-
-      // Seed is 128 bits. Half of sha256 to create seed. Should still have enough randomness
-      new_seed.v[0] =  (unsigned int)  seed._hash[0];
-      new_seed.v[0] ^= (unsigned int)  seed._hash[2];
-      new_seed.v[1] =  (unsigned int)( seed._hash[0] >> 32 );
-      new_seed.v[1] ^= (unsigned int)( seed._hash[2] >> 32 );
-      new_seed.v[2] =  (unsigned int)  seed._hash[1];
-      new_seed.v[2] ^= (unsigned int)  seed._hash[3];
-      new_seed.v[3] =  (unsigned int)( seed._hash[1] >> 32 );
-      new_seed.v[3] ^= (unsigned int)( seed._hash[3] >> 32 );
-
-      return new_seed;
-   }
-
-   bool proof::is_valid( bool test_canonical_order, bool test_intermediate_zeros ) const
-   {
-      _POW::Proof test( n, k, sha_to_seed( seed ), EQUIHASH_NONCE, inputs );
-      if( test_canonical_order && !test.CheckIndexesCanon() )
-         return false;
-      if( test_intermediate_zeros )
-         return test.FullTest();
-      return test.Test();
-   }
-
-   void proof::canonize_indexes()
-   {
-      _POW::Proof p( n, k, sha_to_seed( seed ), EQUIHASH_NONCE, inputs );
-      _POW::Proof p_canon = p.CanonizeIndexes();
-      inputs = p_canon.inputs;
-   }
-
-   proof proof::hash( uint32_t n, uint32_t k, sha256 seed )
-   {
-      auto hash = _POW::Equihash( n, k, sha_to_seed( seed ) );
-      auto result = hash.FindProof( EQUIHASH_NONCE );
-
-      proof p;
-      p.n = n;
-      p.k = k;
-      p.seed = seed;
-      p.inputs = result.inputs;
-
-      return p;
-   }
-
-} } // fc::equihash
diff --git a/vendor/equihash/CMakeLists.txt b/vendor/equihash/CMakeLists.txt
deleted file mode 100644
index a90d302..0000000
--- a/vendor/equihash/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-file(GLOB HEADERS "include/equihash/*.hpp" )
-
-set( CMAKE_C_FLAGS "-std=c99" )
-
-add_library( equihash
-             src/pow.cpp
-             src/blake2b.c
-           )
-
-target_link_libraries( equihash )
-target_include_directories( equihash PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
-
-install( TARGETS
-   equihash
-
-   RUNTIME DESTINATION bin
-   LIBRARY DESTINATION lib
-   ARCHIVE DESTINATION lib
-)
diff --git a/vendor/equihash/include/equihash/blake2-config.h b/vendor/equihash/include/equihash/blake2-config.h
deleted file mode 100644
index 70d61f1..0000000
--- a/vendor/equihash/include/equihash/blake2-config.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-   BLAKE2 reference source code package - optimized C implementations
-
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-
-   To the extent possible under law, the author(s) have dedicated all copyright
-   and related and neighboring rights to this software to the public domain
-   worldwide. This software is distributed without any warranty.
-
-   You should have received a copy of the CC0 Public Domain Dedication along with
-   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
-#pragma once
-#ifndef __BLAKE2_CONFIG_H__
-#define __BLAKE2_CONFIG_H__
-
-// These don't work everywhere
-#if defined(__SSE2__)
-#define HAVE_SSE2
-#endif
-
-#if defined(__SSSE3__)
-#define HAVE_SSSE3
-#endif
-
-#if defined(__SSE4_1__)
-#define HAVE_SSE41
-#endif
-
-#if defined(__AVX__)
-#define HAVE_AVX
-#endif
-
-#if defined(__XOP__)
-#define HAVE_XOP
-#endif
-
-
-#ifdef HAVE_AVX2
-#ifndef HAVE_AVX
-#define HAVE_AVX
-#endif
-#endif
-
-#ifdef HAVE_XOP
-#ifndef HAVE_AVX
-#define HAVE_AVX
-#endif
-#endif
-
-#ifdef HAVE_AVX
-#ifndef HAVE_SSE41
-#define HAVE_SSE41
-#endif
-#endif
-
-#ifdef HAVE_SSE41
-#ifndef HAVE_SSSE3
-#define HAVE_SSSE3
-#endif
-#endif
-
-#ifdef HAVE_SSSE3
-#define HAVE_SSE2
-#endif
-
-#if !defined(HAVE_SSE2)
-#error "This code requires at least SSE2."
-#endif
-
-#endif
-
diff --git a/vendor/equihash/include/equihash/blake2-impl.h b/vendor/equihash/include/equihash/blake2-impl.h
deleted file mode 100644
index 16219db..0000000
--- a/vendor/equihash/include/equihash/blake2-impl.h
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
-   BLAKE2 reference source code package - optimized C implementations
-
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-
-   To the extent possible under law, the author(s) have dedicated all copyright
-   and related and neighboring rights to this software to the public domain
-   worldwide. This software is distributed without any warranty.
-
-   You should have received a copy of the CC0 Public Domain Dedication along with
-   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
-#pragma once
-#ifndef __BLAKE2_IMPL_H__
-#define __BLAKE2_IMPL_H__
-
-#include <stdint.h>
-
-static inline uint32_t load32( const void *src )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  uint32_t w;
-  memcpy(&w, src, sizeof w);
-  return w;
-#else
-  const uint8_t *p = ( const uint8_t * )src;
-  uint32_t w = *p++;
-  w |= ( uint32_t )( *p++ ) <<  8;
-  w |= ( uint32_t )( *p++ ) << 16;
-  w |= ( uint32_t )( *p++ ) << 24;
-  return w;
-#endif
-}
-
-static inline uint64_t load64( const void *src )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  uint64_t w;
-  memcpy(&w, src, sizeof w);
-  return w;
-#else
-  const uint8_t *p = ( const uint8_t * )src;
-  uint64_t w = *p++;
-  w |= ( uint64_t )( *p++ ) <<  8;
-  w |= ( uint64_t )( *p++ ) << 16;
-  w |= ( uint64_t )( *p++ ) << 24;
-  w |= ( uint64_t )( *p++ ) << 32;
-  w |= ( uint64_t )( *p++ ) << 40;
-  w |= ( uint64_t )( *p++ ) << 48;
-  w |= ( uint64_t )( *p++ ) << 56;
-  return w;
-#endif
-}
-
-static inline void store32( void *dst, uint32_t w )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  memcpy(dst, &w, sizeof w);
-#else
-  uint8_t *p = ( uint8_t * )dst;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w;
-#endif
-}
-
-static inline void store64( void *dst, uint64_t w )
-{
-#if defined(NATIVE_LITTLE_ENDIAN)
-  memcpy(dst, &w, sizeof w);
-#else
-  uint8_t *p = ( uint8_t * )dst;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w;
-#endif
-}
-
-static inline uint64_t load48( const void *src )
-{
-  const uint8_t *p = ( const uint8_t * )src;
-  uint64_t w = *p++;
-  w |= ( uint64_t )( *p++ ) <<  8;
-  w |= ( uint64_t )( *p++ ) << 16;
-  w |= ( uint64_t )( *p++ ) << 24;
-  w |= ( uint64_t )( *p++ ) << 32;
-  w |= ( uint64_t )( *p++ ) << 40;
-  return w;
-}
-
-static inline void store48( void *dst, uint64_t w )
-{
-  uint8_t *p = ( uint8_t * )dst;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w; w >>= 8;
-  *p++ = ( uint8_t )w;
-}
-
-static inline uint32_t rotl32( const uint32_t w, const unsigned c )
-{
-  return ( w << c ) | ( w >> ( 32 - c ) );
-}
-
-static inline uint64_t rotl64( const uint64_t w, const unsigned c )
-{
-  return ( w << c ) | ( w >> ( 64 - c ) );
-}
-
-static inline uint32_t rotr32( const uint32_t w, const unsigned c )
-{
-  return ( w >> c ) | ( w << ( 32 - c ) );
-}
-
-static inline uint64_t rotr64( const uint64_t w, const unsigned c )
-{
-  return ( w >> c ) | ( w << ( 64 - c ) );
-}
-
-/* prevents compiler optimizing out memset() */
-static inline void secure_zero_memory( void *v, size_t n )
-{
-  volatile uint8_t *p = ( volatile uint8_t * )v;
-  while( n-- ) *p++ = 0;
-}
-
-#endif
-
diff --git a/vendor/equihash/include/equihash/blake2.h b/vendor/equihash/include/equihash/blake2.h
deleted file mode 100644
index 424e145..0000000
--- a/vendor/equihash/include/equihash/blake2.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/*
-   BLAKE2 reference source code package - optimized C implementations
-
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-
-   To the extent possible under law, the author(s) have dedicated all copyright
-   and related and neighboring rights to this software to the public domain
-   worldwide. This software is distributed without any warranty.
-
-   You should have received a copy of the CC0 Public Domain Dedication along with
-   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
-#pragma once
-#ifndef __BLAKE2_H__
-#define __BLAKE2_H__
-
-#include <stddef.h>
-#include <stdint.h>
-
-#if defined(_MSC_VER)
-#define ALIGN(x) __declspec(align(x))
-#else
-#define ALIGN(x) __attribute__ ((__aligned__(x)))
-#endif
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-  enum blake2s_constant
-  {
-    BLAKE2S_BLOCKBYTES = 64,
-    BLAKE2S_OUTBYTES   = 32,
-    BLAKE2S_KEYBYTES   = 32,
-    BLAKE2S_SALTBYTES  = 8,
-    BLAKE2S_PERSONALBYTES = 8
-  };
-
-  enum blake2b_constant
-  {
-    BLAKE2B_BLOCKBYTES = 128,
-    BLAKE2B_OUTBYTES   = 64,
-    BLAKE2B_KEYBYTES   = 64,
-    BLAKE2B_SALTBYTES  = 16,
-    BLAKE2B_PERSONALBYTES = 16
-  };
-
-#pragma pack(push, 1)
-  typedef struct __blake2s_param
-  {
-    uint8_t  digest_length; // 1
-    uint8_t  key_length;    // 2
-    uint8_t  fanout;        // 3
-    uint8_t  depth;         // 4
-    uint32_t leaf_length;   // 8
-    uint8_t  node_offset[6];// 14
-    uint8_t  node_depth;    // 15
-    uint8_t  inner_length;  // 16
-    // uint8_t  reserved[0];
-    uint8_t  salt[BLAKE2S_SALTBYTES]; // 24
-    uint8_t  personal[BLAKE2S_PERSONALBYTES];  // 32
-  } blake2s_param;
-
-  ALIGN( 64 ) typedef struct __blake2s_state
-  {
-    uint32_t h[8];
-    uint32_t t[2];
-    uint32_t f[2];
-    uint8_t  buf[2 * BLAKE2S_BLOCKBYTES];
-    size_t   buflen;
-    uint8_t  last_node;
-  } blake2s_state;
-
-  typedef struct __blake2b_param
-  {
-    uint8_t  digest_length; // 1
-    uint8_t  key_length;    // 2
-    uint8_t  fanout;        // 3
-    uint8_t  depth;         // 4
-    uint32_t leaf_length;   // 8
-    uint64_t node_offset;   // 16
-    uint8_t  node_depth;    // 17
-    uint8_t  inner_length;  // 18
-    uint8_t  reserved[14];  // 32
-    uint8_t  salt[BLAKE2B_SALTBYTES]; // 48
-    uint8_t  personal[BLAKE2B_PERSONALBYTES];  // 64
-  } blake2b_param;
-
-  ALIGN( 64 ) typedef struct __blake2b_state
-  {
-    uint64_t h[8];
-    uint64_t t[2];
-    uint64_t f[2];
-    uint8_t  buf[2 * BLAKE2B_BLOCKBYTES];
-    size_t   buflen;
-    uint8_t  last_node;
-  } blake2b_state;
-
-  ALIGN( 64 ) typedef struct __blake2sp_state
-  {
-    blake2s_state S[8][1];
-    blake2s_state R[1];
-    uint8_t buf[8 * BLAKE2S_BLOCKBYTES];
-    size_t  buflen;
-  } blake2sp_state;
-
-  ALIGN( 64 ) typedef struct __blake2bp_state
-  {
-    blake2b_state S[4][1];
-    blake2b_state R[1];
-    uint8_t buf[4 * BLAKE2B_BLOCKBYTES];
-    size_t  buflen;
-  } blake2bp_state;
-#pragma pack(pop)
-
-  // Streaming API
-  int blake2s_init( blake2s_state *S, const uint8_t outlen );
-  int blake2s_init_key( blake2s_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
-  int blake2s_init_param( blake2s_state *S, const blake2s_param *P );
-  int blake2s_update( blake2s_state *S, const uint8_t *in, uint64_t inlen );
-  int blake2s_final( blake2s_state *S, uint8_t *out, uint8_t outlen );
-
-  int blake2b_init( blake2b_state *S, const uint8_t outlen );
-  int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
-  int blake2b_init_param( blake2b_state *S, const blake2b_param *P );
-  int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen );
-  int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen );
-
-  int blake2sp_init( blake2sp_state *S, const uint8_t outlen );
-  int blake2sp_init_key( blake2sp_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
-  int blake2sp_update( blake2sp_state *S, const uint8_t *in, uint64_t inlen );
-  int blake2sp_final( blake2sp_state *S, uint8_t *out, uint8_t outlen );
-
-  int blake2bp_init( blake2bp_state *S, const uint8_t outlen );
-  int blake2bp_init_key( blake2bp_state *S, const uint8_t outlen, const void *key, const uint8_t keylen );
-  int blake2bp_update( blake2bp_state *S, const uint8_t *in, uint64_t inlen );
-  int blake2bp_final( blake2bp_state *S, uint8_t *out, uint8_t outlen );
-
-  // Simple API
-  int blake2s( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
-  int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
-  int blake2b_long(uint8_t *out, const void *in, const uint32_t outlen, const uint64_t inlen);
-
-  int blake2sp( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
-  int blake2bp( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen );
-
-  static inline int blake2( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen )
-  {
-    return blake2b( out, in, key, outlen, inlen, keylen );
-  }
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif
-
diff --git a/vendor/equihash/include/equihash/blake2b-load-sse2.h b/vendor/equihash/include/equihash/blake2b-load-sse2.h
deleted file mode 100644
index 1ba153c..0000000
--- a/vendor/equihash/include/equihash/blake2b-load-sse2.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-   BLAKE2 reference source code package - optimized C implementations
-
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-
-   To the extent possible under law, the author(s) have dedicated all copyright
-   and related and neighboring rights to this software to the public domain
-   worldwide. This software is distributed without any warranty.
-
-   You should have received a copy of the CC0 Public Domain Dedication along with
-   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
-#pragma once
-#ifndef __BLAKE2B_LOAD_SSE2_H__
-#define __BLAKE2B_LOAD_SSE2_H__
-
-#define LOAD_MSG_0_1(b0, b1) b0 = _mm_set_epi64x(m2, m0); b1 = _mm_set_epi64x(m6, m4)
-#define LOAD_MSG_0_2(b0, b1) b0 = _mm_set_epi64x(m3, m1); b1 = _mm_set_epi64x(m7, m5)
-#define LOAD_MSG_0_3(b0, b1) b0 = _mm_set_epi64x(m10, m8); b1 = _mm_set_epi64x(m14, m12)
-#define LOAD_MSG_0_4(b0, b1) b0 = _mm_set_epi64x(m11, m9); b1 = _mm_set_epi64x(m15, m13)
-#define LOAD_MSG_1_1(b0, b1) b0 = _mm_set_epi64x(m4, m14); b1 = _mm_set_epi64x(m13, m9)
-#define LOAD_MSG_1_2(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m6, m15)
-#define LOAD_MSG_1_3(b0, b1) b0 = _mm_set_epi64x(m0, m1); b1 = _mm_set_epi64x(m5, m11)
-#define LOAD_MSG_1_4(b0, b1) b0 = _mm_set_epi64x(m2, m12); b1 = _mm_set_epi64x(m3, m7)
-#define LOAD_MSG_2_1(b0, b1) b0 = _mm_set_epi64x(m12, m11); b1 = _mm_set_epi64x(m15, m5)
-#define LOAD_MSG_2_2(b0, b1) b0 = _mm_set_epi64x(m0, m8); b1 = _mm_set_epi64x(m13, m2)
-#define LOAD_MSG_2_3(b0, b1) b0 = _mm_set_epi64x(m3, m10); b1 = _mm_set_epi64x(m9, m7)
-#define LOAD_MSG_2_4(b0, b1) b0 = _mm_set_epi64x(m6, m14); b1 = _mm_set_epi64x(m4, m1)
-#define LOAD_MSG_3_1(b0, b1) b0 = _mm_set_epi64x(m3, m7); b1 = _mm_set_epi64x(m11, m13)
-#define LOAD_MSG_3_2(b0, b1) b0 = _mm_set_epi64x(m1, m9); b1 = _mm_set_epi64x(m14, m12)
-#define LOAD_MSG_3_3(b0, b1) b0 = _mm_set_epi64x(m5, m2); b1 = _mm_set_epi64x(m15, m4)
-#define LOAD_MSG_3_4(b0, b1) b0 = _mm_set_epi64x(m10, m6); b1 = _mm_set_epi64x(m8, m0)
-#define LOAD_MSG_4_1(b0, b1) b0 = _mm_set_epi64x(m5, m9); b1 = _mm_set_epi64x(m10, m2)
-#define LOAD_MSG_4_2(b0, b1) b0 = _mm_set_epi64x(m7, m0); b1 = _mm_set_epi64x(m15, m4)
-#define LOAD_MSG_4_3(b0, b1) b0 = _mm_set_epi64x(m11, m14); b1 = _mm_set_epi64x(m3, m6)
-#define LOAD_MSG_4_4(b0, b1) b0 = _mm_set_epi64x(m12, m1); b1 = _mm_set_epi64x(m13, m8)
-#define LOAD_MSG_5_1(b0, b1) b0 = _mm_set_epi64x(m6, m2); b1 = _mm_set_epi64x(m8, m0)
-#define LOAD_MSG_5_2(b0, b1) b0 = _mm_set_epi64x(m10, m12); b1 = _mm_set_epi64x(m3, m11)
-#define LOAD_MSG_5_3(b0, b1) b0 = _mm_set_epi64x(m7, m4); b1 = _mm_set_epi64x(m1, m15)
-#define LOAD_MSG_5_4(b0, b1) b0 = _mm_set_epi64x(m5, m13); b1 = _mm_set_epi64x(m9, m14)
-#define LOAD_MSG_6_1(b0, b1) b0 = _mm_set_epi64x(m1, m12); b1 = _mm_set_epi64x(m4, m14)
-#define LOAD_MSG_6_2(b0, b1) b0 = _mm_set_epi64x(m15, m5); b1 = _mm_set_epi64x(m10, m13)
-#define LOAD_MSG_6_3(b0, b1) b0 = _mm_set_epi64x(m6, m0); b1 = _mm_set_epi64x(m8, m9)
-#define LOAD_MSG_6_4(b0, b1) b0 = _mm_set_epi64x(m3, m7); b1 = _mm_set_epi64x(m11, m2)
-#define LOAD_MSG_7_1(b0, b1) b0 = _mm_set_epi64x(m7, m13); b1 = _mm_set_epi64x(m3, m12)
-#define LOAD_MSG_7_2(b0, b1) b0 = _mm_set_epi64x(m14, m11); b1 = _mm_set_epi64x(m9, m1)
-#define LOAD_MSG_7_3(b0, b1) b0 = _mm_set_epi64x(m15, m5); b1 = _mm_set_epi64x(m2, m8)
-#define LOAD_MSG_7_4(b0, b1) b0 = _mm_set_epi64x(m4, m0); b1 = _mm_set_epi64x(m10, m6)
-#define LOAD_MSG_8_1(b0, b1) b0 = _mm_set_epi64x(m14, m6); b1 = _mm_set_epi64x(m0, m11)
-#define LOAD_MSG_8_2(b0, b1) b0 = _mm_set_epi64x(m9, m15); b1 = _mm_set_epi64x(m8, m3)
-#define LOAD_MSG_8_3(b0, b1) b0 = _mm_set_epi64x(m13, m12); b1 = _mm_set_epi64x(m10, m1)
-#define LOAD_MSG_8_4(b0, b1) b0 = _mm_set_epi64x(m7, m2); b1 = _mm_set_epi64x(m5, m4)
-#define LOAD_MSG_9_1(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m1, m7)
-#define LOAD_MSG_9_2(b0, b1) b0 = _mm_set_epi64x(m4, m2); b1 = _mm_set_epi64x(m5, m6)
-#define LOAD_MSG_9_3(b0, b1) b0 = _mm_set_epi64x(m9, m15); b1 = _mm_set_epi64x(m13, m3)
-#define LOAD_MSG_9_4(b0, b1) b0 = _mm_set_epi64x(m14, m11); b1 = _mm_set_epi64x(m0, m12)
-#define LOAD_MSG_10_1(b0, b1) b0 = _mm_set_epi64x(m2, m0); b1 = _mm_set_epi64x(m6, m4)
-#define LOAD_MSG_10_2(b0, b1) b0 = _mm_set_epi64x(m3, m1); b1 = _mm_set_epi64x(m7, m5)
-#define LOAD_MSG_10_3(b0, b1) b0 = _mm_set_epi64x(m10, m8); b1 = _mm_set_epi64x(m14, m12)
-#define LOAD_MSG_10_4(b0, b1) b0 = _mm_set_epi64x(m11, m9); b1 = _mm_set_epi64x(m15, m13)
-#define LOAD_MSG_11_1(b0, b1) b0 = _mm_set_epi64x(m4, m14); b1 = _mm_set_epi64x(m13, m9)
-#define LOAD_MSG_11_2(b0, b1) b0 = _mm_set_epi64x(m8, m10); b1 = _mm_set_epi64x(m6, m15)
-#define LOAD_MSG_11_3(b0, b1) b0 = _mm_set_epi64x(m0, m1); b1 = _mm_set_epi64x(m5, m11)
-#define LOAD_MSG_11_4(b0, b1) b0 = _mm_set_epi64x(m2, m12); b1 = _mm_set_epi64x(m3, m7)
-
-
-#endif
-
diff --git a/vendor/equihash/include/equihash/blake2b-load-sse41.h b/vendor/equihash/include/equihash/blake2b-load-sse41.h
deleted file mode 100644
index f6c1bc8..0000000
--- a/vendor/equihash/include/equihash/blake2b-load-sse41.h
+++ /dev/null
@@ -1,402 +0,0 @@
-/*
-   BLAKE2 reference source code package - optimized C implementations
-
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-
-   To the extent possible under law, the author(s) have dedicated all copyright
-   and related and neighboring rights to this software to the public domain
-   worldwide. This software is distributed without any warranty.
-
-   You should have received a copy of the CC0 Public Domain Dedication along with
-   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
-#pragma once
-#ifndef __BLAKE2B_LOAD_SSE41_H__
-#define __BLAKE2B_LOAD_SSE41_H__
-
-#define LOAD_MSG_0_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m0, m1); \
-b1 = _mm_unpacklo_epi64(m2, m3); \
-} while(0)
-
-
-#define LOAD_MSG_0_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m0, m1); \
-b1 = _mm_unpackhi_epi64(m2, m3); \
-} while(0)
-
-
-#define LOAD_MSG_0_3(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m4, m5); \
-b1 = _mm_unpacklo_epi64(m6, m7); \
-} while(0)
-
-
-#define LOAD_MSG_0_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m4, m5); \
-b1 = _mm_unpackhi_epi64(m6, m7); \
-} while(0)
-
-
-#define LOAD_MSG_1_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m7, m2); \
-b1 = _mm_unpackhi_epi64(m4, m6); \
-} while(0)
-
-
-#define LOAD_MSG_1_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m5, m4); \
-b1 = _mm_alignr_epi8(m3, m7, 8); \
-} while(0)
-
-
-#define LOAD_MSG_1_3(b0, b1) \
-do \
-{ \
-b0 = _mm_shuffle_epi32(m0, _MM_SHUFFLE(1,0,3,2)); \
-b1 = _mm_unpackhi_epi64(m5, m2); \
-} while(0)
-
-
-#define LOAD_MSG_1_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m6, m1); \
-b1 = _mm_unpackhi_epi64(m3, m1); \
-} while(0)
-
-
-#define LOAD_MSG_2_1(b0, b1) \
-do \
-{ \
-b0 = _mm_alignr_epi8(m6, m5, 8); \
-b1 = _mm_unpackhi_epi64(m2, m7); \
-} while(0)
-
-
-#define LOAD_MSG_2_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m4, m0); \
-b1 = _mm_blend_epi16(m1, m6, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_2_3(b0, b1) \
-do \
-{ \
-b0 = _mm_blend_epi16(m5, m1, 0xF0); \
-b1 = _mm_unpackhi_epi64(m3, m4); \
-} while(0)
-
-
-#define LOAD_MSG_2_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m7, m3); \
-b1 = _mm_alignr_epi8(m2, m0, 8); \
-} while(0)
-
-
-#define LOAD_MSG_3_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m3, m1); \
-b1 = _mm_unpackhi_epi64(m6, m5); \
-} while(0)
-
-
-#define LOAD_MSG_3_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m4, m0); \
-b1 = _mm_unpacklo_epi64(m6, m7); \
-} while(0)
-
-
-#define LOAD_MSG_3_3(b0, b1) \
-do \
-{ \
-b0 = _mm_blend_epi16(m1, m2, 0xF0); \
-b1 = _mm_blend_epi16(m2, m7, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_3_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m3, m5); \
-b1 = _mm_unpacklo_epi64(m0, m4); \
-} while(0)
-
-
-#define LOAD_MSG_4_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m4, m2); \
-b1 = _mm_unpacklo_epi64(m1, m5); \
-} while(0)
-
-
-#define LOAD_MSG_4_2(b0, b1) \
-do \
-{ \
-b0 = _mm_blend_epi16(m0, m3, 0xF0); \
-b1 = _mm_blend_epi16(m2, m7, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_4_3(b0, b1) \
-do \
-{ \
-b0 = _mm_blend_epi16(m7, m5, 0xF0); \
-b1 = _mm_blend_epi16(m3, m1, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_4_4(b0, b1) \
-do \
-{ \
-b0 = _mm_alignr_epi8(m6, m0, 8); \
-b1 = _mm_blend_epi16(m4, m6, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_5_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m1, m3); \
-b1 = _mm_unpacklo_epi64(m0, m4); \
-} while(0)
-
-
-#define LOAD_MSG_5_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m6, m5); \
-b1 = _mm_unpackhi_epi64(m5, m1); \
-} while(0)
-
-
-#define LOAD_MSG_5_3(b0, b1) \
-do \
-{ \
-b0 = _mm_blend_epi16(m2, m3, 0xF0); \
-b1 = _mm_unpackhi_epi64(m7, m0); \
-} while(0)
-
-
-#define LOAD_MSG_5_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m6, m2); \
-b1 = _mm_blend_epi16(m7, m4, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_6_1(b0, b1) \
-do \
-{ \
-b0 = _mm_blend_epi16(m6, m0, 0xF0); \
-b1 = _mm_unpacklo_epi64(m7, m2); \
-} while(0)
-
-
-#define LOAD_MSG_6_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m2, m7); \
-b1 = _mm_alignr_epi8(m5, m6, 8); \
-} while(0)
-
-
-#define LOAD_MSG_6_3(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m0, m3); \
-b1 = _mm_shuffle_epi32(m4, _MM_SHUFFLE(1,0,3,2)); \
-} while(0)
-
-
-#define LOAD_MSG_6_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m3, m1); \
-b1 = _mm_blend_epi16(m1, m5, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_7_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m6, m3); \
-b1 = _mm_blend_epi16(m6, m1, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_7_2(b0, b1) \
-do \
-{ \
-b0 = _mm_alignr_epi8(m7, m5, 8); \
-b1 = _mm_unpackhi_epi64(m0, m4); \
-} while(0)
-
-
-#define LOAD_MSG_7_3(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m2, m7); \
-b1 = _mm_unpacklo_epi64(m4, m1); \
-} while(0)
-
-
-#define LOAD_MSG_7_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m0, m2); \
-b1 = _mm_unpacklo_epi64(m3, m5); \
-} while(0)
-
-
-#define LOAD_MSG_8_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m3, m7); \
-b1 = _mm_alignr_epi8(m0, m5, 8); \
-} while(0)
-
-
-#define LOAD_MSG_8_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m7, m4); \
-b1 = _mm_alignr_epi8(m4, m1, 8); \
-} while(0)
-
-
-#define LOAD_MSG_8_3(b0, b1) \
-do \
-{ \
-b0 = m6; \
-b1 = _mm_alignr_epi8(m5, m0, 8); \
-} while(0)
-
-
-#define LOAD_MSG_8_4(b0, b1) \
-do \
-{ \
-b0 = _mm_blend_epi16(m1, m3, 0xF0); \
-b1 = m2; \
-} while(0)
-
-
-#define LOAD_MSG_9_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m5, m4); \
-b1 = _mm_unpackhi_epi64(m3, m0); \
-} while(0)
-
-
-#define LOAD_MSG_9_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m1, m2); \
-b1 = _mm_blend_epi16(m3, m2, 0xF0); \
-} while(0)
-
-
-#define LOAD_MSG_9_3(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m7, m4); \
-b1 = _mm_unpackhi_epi64(m1, m6); \
-} while(0)
-
-
-#define LOAD_MSG_9_4(b0, b1) \
-do \
-{ \
-b0 = _mm_alignr_epi8(m7, m5, 8); \
-b1 = _mm_unpacklo_epi64(m6, m0); \
-} while(0)
-
-
-#define LOAD_MSG_10_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m0, m1); \
-b1 = _mm_unpacklo_epi64(m2, m3); \
-} while(0)
-
-
-#define LOAD_MSG_10_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m0, m1); \
-b1 = _mm_unpackhi_epi64(m2, m3); \
-} while(0)
-
-
-#define LOAD_MSG_10_3(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m4, m5); \
-b1 = _mm_unpacklo_epi64(m6, m7); \
-} while(0)
-
-
-#define LOAD_MSG_10_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpackhi_epi64(m4, m5); \
-b1 = _mm_unpackhi_epi64(m6, m7); \
-} while(0)
-
-
-#define LOAD_MSG_11_1(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m7, m2); \
-b1 = _mm_unpackhi_epi64(m4, m6); \
-} while(0)
-
-
-#define LOAD_MSG_11_2(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m5, m4); \
-b1 = _mm_alignr_epi8(m3, m7, 8); \
-} while(0)
-
-
-#define LOAD_MSG_11_3(b0, b1) \
-do \
-{ \
-b0 = _mm_shuffle_epi32(m0, _MM_SHUFFLE(1,0,3,2)); \
-b1 = _mm_unpackhi_epi64(m5, m2); \
-} while(0)
-
-
-#define LOAD_MSG_11_4(b0, b1) \
-do \
-{ \
-b0 = _mm_unpacklo_epi64(m6, m1); \
-b1 = _mm_unpackhi_epi64(m3, m1); \
-} while(0)
-
-
-#endif
-
diff --git a/vendor/equihash/include/equihash/blake2b-round.h b/vendor/equihash/include/equihash/blake2b-round.h
deleted file mode 100644
index 75aad89..0000000
--- a/vendor/equihash/include/equihash/blake2b-round.h
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-   BLAKE2 reference source code package - optimized C implementations
-
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-
-   To the extent possible under law, the author(s) have dedicated all copyright
-   and related and neighboring rights to this software to the public domain
-   worldwide. This software is distributed without any warranty.
-
-   You should have received a copy of the CC0 Public Domain Dedication along with
-   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
-#pragma once
-#ifndef __BLAKE2B_ROUND_H__
-#define __BLAKE2B_ROUND_H__
-
-#define LOAD(p)  _mm_load_si128( (const __m128i *)(p) )
-#define STORE(p,r) _mm_store_si128((__m128i *)(p), r)
-
-#define LOADU(p)  _mm_loadu_si128( (const __m128i *)(p) )
-#define STOREU(p,r) _mm_storeu_si128((__m128i *)(p), r)
-
-#define TOF(reg) _mm_castsi128_ps((reg))
-#define TOI(reg) _mm_castps_si128((reg))
-
-#define LIKELY(x) __builtin_expect((x),1)
-
-
-/* Microarchitecture-specific macros */
-#ifndef HAVE_XOP
-#ifdef HAVE_SSSE3
-#define _mm_roti_epi64(x, c) \
-    (-(c) == 32) ? _mm_shuffle_epi32((x), _MM_SHUFFLE(2,3,0,1))  \
-    : (-(c) == 24) ? _mm_shuffle_epi8((x), r24) \
-    : (-(c) == 16) ? _mm_shuffle_epi8((x), r16) \
-    : (-(c) == 63) ? _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_add_epi64((x), (x)))  \
-    : _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_slli_epi64((x), 64-(-(c))))
-#else
-#define _mm_roti_epi64(r, c) _mm_xor_si128(_mm_srli_epi64( (r), -(c) ),_mm_slli_epi64( (r), 64-(-c) ))
-#endif
-#else
-/* ... */
-#endif
-
-
-
-#define G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l); \
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h); \
-  \
-  row4l = _mm_xor_si128(row4l, row1l); \
-  row4h = _mm_xor_si128(row4h, row1h); \
-  \
-  row4l = _mm_roti_epi64(row4l, -32); \
-  row4h = _mm_roti_epi64(row4h, -32); \
-  \
-  row3l = _mm_add_epi64(row3l, row4l); \
-  row3h = _mm_add_epi64(row3h, row4h); \
-  \
-  row2l = _mm_xor_si128(row2l, row3l); \
-  row2h = _mm_xor_si128(row2h, row3h); \
-  \
-  row2l = _mm_roti_epi64(row2l, -24); \
-  row2h = _mm_roti_epi64(row2h, -24); \
-
-#define G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1) \
-  row1l = _mm_add_epi64(_mm_add_epi64(row1l, b0), row2l); \
-  row1h = _mm_add_epi64(_mm_add_epi64(row1h, b1), row2h); \
-  \
-  row4l = _mm_xor_si128(row4l, row1l); \
-  row4h = _mm_xor_si128(row4h, row1h); \
-  \
-  row4l = _mm_roti_epi64(row4l, -16); \
-  row4h = _mm_roti_epi64(row4h, -16); \
-  \
-  row3l = _mm_add_epi64(row3l, row4l); \
-  row3h = _mm_add_epi64(row3h, row4h); \
-  \
-  row2l = _mm_xor_si128(row2l, row3l); \
-  row2h = _mm_xor_si128(row2h, row3h); \
-  \
-  row2l = _mm_roti_epi64(row2l, -63); \
-  row2h = _mm_roti_epi64(row2h, -63); \
-
-#if defined(HAVE_SSSE3)
-#define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
-  t0 = _mm_alignr_epi8(row2h, row2l, 8); \
-  t1 = _mm_alignr_epi8(row2l, row2h, 8); \
-  row2l = t0; \
-  row2h = t1; \
-  \
-  t0 = row3l; \
-  row3l = row3h; \
-  row3h = t0;    \
-  \
-  t0 = _mm_alignr_epi8(row4h, row4l, 8); \
-  t1 = _mm_alignr_epi8(row4l, row4h, 8); \
-  row4l = t1; \
-  row4h = t0;
-
-#define UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
-  t0 = _mm_alignr_epi8(row2l, row2h, 8); \
-  t1 = _mm_alignr_epi8(row2h, row2l, 8); \
-  row2l = t0; \
-  row2h = t1; \
-  \
-  t0 = row3l; \
-  row3l = row3h; \
-  row3h = t0; \
-  \
-  t0 = _mm_alignr_epi8(row4l, row4h, 8); \
-  t1 = _mm_alignr_epi8(row4h, row4l, 8); \
-  row4l = t1; \
-  row4h = t0;
-#else
-
-#define DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
-  t0 = row4l;\
-  t1 = row2l;\
-  row4l = row3l;\
-  row3l = row3h;\
-  row3h = row4l;\
-  row4l = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t0, t0)); \
-  row4h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row4h, row4h)); \
-  row2l = _mm_unpackhi_epi64(row2l, _mm_unpacklo_epi64(row2h, row2h)); \
-  row2h = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(t1, t1))
-
-#define UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h) \
-  t0 = row3l;\
-  row3l = row3h;\
-  row3h = t0;\
-  t0 = row2l;\
-  t1 = row4l;\
-  row2l = _mm_unpackhi_epi64(row2h, _mm_unpacklo_epi64(row2l, row2l)); \
-  row2h = _mm_unpackhi_epi64(t0, _mm_unpacklo_epi64(row2h, row2h)); \
-  row4l = _mm_unpackhi_epi64(row4l, _mm_unpacklo_epi64(row4h, row4h)); \
-  row4h = _mm_unpackhi_epi64(row4h, _mm_unpacklo_epi64(t1, t1))
-
-#endif
-
-#if defined(HAVE_SSE41)
-#include <equihash/blake2b-load-sse41.h>
-#else
-#include <equihash/blake2b-load-sse2.h>
-#endif
-
-#define ROUND(r) \
-  LOAD_MSG_ ##r ##_1(b0, b1); \
-  G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
-  LOAD_MSG_ ##r ##_2(b0, b1); \
-  G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
-  DIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h); \
-  LOAD_MSG_ ##r ##_3(b0, b1); \
-  G1(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
-  LOAD_MSG_ ##r ##_4(b0, b1); \
-  G2(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h,b0,b1); \
-  UNDIAGONALIZE(row1l,row2l,row3l,row4l,row1h,row2h,row3h,row4h);
-
-#endif
-
-#define BLAKE2_ROUND(row1l,row1h,row2l,row2h,row3l,row3h,row4l,row4h) \
-	G1(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
-	G2(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
-	\
-	DIAGONALIZE(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
-	\
-	G1(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
-	G2(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h); \
-	\
-	UNDIAGONALIZE(row1l, row2l, row3l, row4l, row1h, row2h, row3h, row4h);
diff --git a/vendor/equihash/include/equihash/pow.hpp b/vendor/equihash/include/equihash/pow.hpp
deleted file mode 100644
index 297194d..0000000
--- a/vendor/equihash/include/equihash/pow.hpp
+++ /dev/null
@@ -1,120 +0,0 @@
-/*Code by Dmitry Khovratovich, 2016
-CC0 license
-*/
-
-#ifndef __POW
-#define __POW
-
-#include <cstdint>
-
-#include <vector>
-#include <cstdio>
-
-
-const int SEED_LENGTH=4; //Length of seed in dwords ;
-const int NONCE_LENGTH=24; //Length of nonce in bytes;
-const int MAX_NONCE = 0xFFFFF;
-const int MAX_N = 32; //Max length of n in bytes, should not exceed 32
-const int LIST_LENGTH = 5;
-const unsigned FORK_MULTIPLIER=3; //Maximum collision factor
-
-/* The block used to initialize the PoW search
-   @v actual values
-*/
-namespace _POW{
-
-	struct Seed{
-		std::vector<uint32_t> v;
-
-		Seed(){
-			v.resize(SEED_LENGTH,0);
-		}
-		explicit Seed(uint32_t x){
-            v.resize(SEED_LENGTH, x);
-		}
-		Seed(const Seed&r){
-			v= r.v;
-		}
-		Seed& operator=(const Seed&r){
-			v = r.v;
-            return *this;
-		}
-        const uint32_t& operator[](unsigned i) const{ return v[i]; }
-	};
-
-	/* Different nonces for PoW search
-	   @v actual values
-	   */
-    typedef uint32_t Nonce;
-    typedef uint32_t Input;
-
-	/*Actual proof of work
-	*
-	*
-	*
-	*/
-	struct Proof{
-		const unsigned n;
-		const unsigned k;
-		const Seed seed;
-		const Nonce nonce;
-		const std::vector<Input> inputs;
-        Proof(unsigned n_v, unsigned k_v, Seed I_v, Nonce V_v, std::vector<Input> inputs_v):
-        n(n_v), k(k_v), seed(I_v), nonce(V_v), inputs(inputs_v){};
-        Proof():n(0),k(1),seed(0),nonce(0),inputs(std::vector<Input>()) {};
-
-        bool Test();
-        bool FullTest()const;
-        bool CheckIndexesCanon()const;
-        Proof CanonizeIndexes()const;
-	};
-
-    class Tuple {
-    public:
-        std::vector<uint32_t> blocks;
-        Input reference;
-        Tuple(unsigned i) { blocks.resize(i); }
-        Tuple& operator=(const Tuple &r) {
-            blocks = r.blocks;
-            reference = r.reference;
-            return *this;
-        }
-    };
-
-    class Fork {
-    public:
-        Input ref1, ref2;
-        Fork() {};
-        Fork(Input r1, Input r2) : ref1(r1), ref2(r2) {};
-    };
-
-	/*Algorithm class for creating proof
-    Assumes that n/(k+1) <=32
-	*
-	*/
-	class Equihash{
-        std::vector<std::vector<Tuple>> tupleList;
-        std::vector<unsigned> filledList;
-        std::vector<Proof> solutions;
-        std::vector<std::vector<Fork>> forks;
-        unsigned n;
-        unsigned k;
-        Seed seed;
-        Nonce nonce;
-	public:
-        /*
-        Initializes memory.
-        */
-        Equihash(unsigned n_in, unsigned k_in, Seed s) :n(n_in), k(k_in), seed(s) {};
-        ~Equihash() {};
-		  Proof FindProof();
-        Proof FindProof( Nonce n );
-        void FillMemory(uint32_t length);      //fill with hash
-        void InitializeMemory(); //allocate memory
-        void ResolveCollisions(bool store);
-        std::vector<Input> ResolveTree(Fork fork);
-        std::vector<Input> ResolveTreeByLevel(Fork fork, unsigned level);
-	};
-}
-
-#endif //define __POW
diff --git a/vendor/equihash/src/blake2b.c b/vendor/equihash/src/blake2b.c
deleted file mode 100644
index e08562e..0000000
--- a/vendor/equihash/src/blake2b.c
+++ /dev/null
@@ -1,469 +0,0 @@
-/*
-   BLAKE2 reference source code package - optimized C implementations
-
-   Written in 2012 by Samuel Neves <sneves@dei.uc.pt>
-
-   To the extent possible under law, the author(s) have dedicated all copyright
-   and related and neighboring rights to this software to the public domain
-   worldwide. This software is distributed without any warranty.
-
-   You should have received a copy of the CC0 Public Domain Dedication along with
-   this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
-*/
-
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-
-#include <equihash/blake2.h>
-#include <equihash/blake2-impl.h>
-
-#include <equihash/blake2-config.h>
-
-
-#include <emmintrin.h>
-#if defined(HAVE_SSSE3)
-#include <tmmintrin.h>
-#endif
-#if defined(HAVE_SSE41)
-#include <smmintrin.h>
-#endif
-#if defined(HAVE_AVX)
-#include <immintrin.h>
-#endif
-#if defined(HAVE_XOP)
-#include <x86intrin.h>
-#endif
-
-#include <equihash/blake2b-round.h>
-
-ALIGN( 64 ) static const uint64_t blake2b_IV[8] =
-{
-  0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL,
-  0x3c6ef372fe94f82bULL, 0xa54ff53a5f1d36f1ULL,
-  0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
-  0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
-};
-
-static const uint8_t blake2b_sigma[12][16] =
-{
-  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 } ,
-  { 11,  8, 12,  0,  5,  2, 15, 13, 10, 14,  3,  6,  7,  1,  9,  4 } ,
-  {  7,  9,  3,  1, 13, 12, 11, 14,  2,  6,  5, 10,  4,  0, 15,  8 } ,
-  {  9,  0,  5,  7,  2,  4, 10, 15, 14,  1, 11, 12,  6,  8,  3, 13 } ,
-  {  2, 12,  6, 10,  0, 11,  8,  3,  4, 13,  7,  5, 15, 14,  1,  9 } ,
-  { 12,  5,  1, 15, 14, 13,  4, 10,  0,  7,  6,  3,  9,  2,  8, 11 } ,
-  { 13, 11,  7, 14, 12,  1,  3,  9,  5,  0, 15,  4,  8,  6,  2, 10 } ,
-  {  6, 15, 14,  9, 11,  3,  0,  8, 12,  2, 13,  7,  1,  4, 10,  5 } ,
-  { 10,  2,  8,  4,  7,  6,  1,  5, 15, 11,  9, 14,  3, 12, 13 , 0 } ,
-  {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15 } ,
-  { 14, 10,  4,  8,  9, 15, 13,  6,  1, 12,  0,  2, 11,  7,  5,  3 }
-};
-
-
-/* Some helper functions, not necessarily useful */
-static inline int blake2b_set_lastnode( blake2b_state *S )
-{
-  S->f[1] = ~0ULL;
-  return 0;
-}
-
-static inline int blake2b_clear_lastnode( blake2b_state *S )
-{
-  S->f[1] = 0ULL;
-  return 0;
-}
-
-static inline int blake2b_set_lastblock( blake2b_state *S )
-{
-  if( S->last_node ) blake2b_set_lastnode( S );
-
-  S->f[0] = ~0ULL;
-  return 0;
-}
-
-static inline int blake2b_clear_lastblock( blake2b_state *S )
-{
-  if( S->last_node ) blake2b_clear_lastnode( S );
-
-  S->f[0] = 0ULL;
-  return 0;
-}
-
-
-static inline int blake2b_increment_counter( blake2b_state *S, const uint64_t inc )
-{
-#if __x86_64__
-  // ADD/ADC chain
-  __uint128_t t = ( ( __uint128_t )S->t[1] << 64 ) | S->t[0];
-  t += inc;
-  S->t[0] = ( uint64_t )( t >>  0 );
-  S->t[1] = ( uint64_t )( t >> 64 );
-#else
-  S->t[0] += inc;
-  S->t[1] += ( S->t[0] < inc );
-#endif
-  return 0;
-}
-
-
-// Parameter-related functions
-static inline int blake2b_param_set_digest_length( blake2b_param *P, const uint8_t digest_length )
-{
-  P->digest_length = digest_length;
-  return 0;
-}
-
-static inline int blake2b_param_set_fanout( blake2b_param *P, const uint8_t fanout )
-{
-  P->fanout = fanout;
-  return 0;
-}
-
-static inline int blake2b_param_set_max_depth( blake2b_param *P, const uint8_t depth )
-{
-  P->depth = depth;
-  return 0;
-}
-
-static inline int blake2b_param_set_leaf_length( blake2b_param *P, const uint32_t leaf_length )
-{
-  P->leaf_length = leaf_length;
-  return 0;
-}
-
-static inline int blake2b_param_set_node_offset( blake2b_param *P, const uint64_t node_offset )
-{
-  P->node_offset = node_offset;
-  return 0;
-}
-
-static inline int blake2b_param_set_node_depth( blake2b_param *P, const uint8_t node_depth )
-{
-  P->node_depth = node_depth;
-  return 0;
-}
-
-static inline int blake2b_param_set_inner_length( blake2b_param *P, const uint8_t inner_length )
-{
-  P->inner_length = inner_length;
-  return 0;
-}
-
-static inline int blake2b_param_set_salt( blake2b_param *P, const uint8_t salt[BLAKE2B_SALTBYTES] )
-{
-  memcpy( P->salt, salt, BLAKE2B_SALTBYTES );
-  return 0;
-}
-
-static inline int blake2b_param_set_personal( blake2b_param *P, const uint8_t personal[BLAKE2B_PERSONALBYTES] )
-{
-  memcpy( P->personal, personal, BLAKE2B_PERSONALBYTES );
-  return 0;
-}
-
-static inline int blake2b_init0( blake2b_state *S )
-{
-  memset( S, 0, sizeof( blake2b_state ) );
-
-  for( int i = 0; i < 8; ++i ) S->h[i] = blake2b_IV[i];
-
-  return 0;
-}
-
-/* init xors IV with input parameter block */
-int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
-{
-  //blake2b_init0( S );
-  const uint8_t * v = ( const uint8_t * )( blake2b_IV );
-  const uint8_t * p = ( const uint8_t * )( P );
-  uint8_t * h = ( uint8_t * )( S->h );
-  /* IV XOR ParamBlock */
-  memset( S, 0, sizeof( blake2b_state ) );
-
-  for( int i = 0; i < BLAKE2B_OUTBYTES; ++i ) h[i] = v[i] ^ p[i];
-
-  return 0;
-}
-
-
-/* Some sort of default parameter block initialization, for sequential blake2b */
-int blake2b_init( blake2b_state *S, const uint8_t outlen )
-{
-  if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
-
-  const blake2b_param P =
-  {
-    outlen,
-    0,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    {0},
-    {0},
-    {0}
-  };
-  return blake2b_init_param( S, &P );
-}
-
-int blake2b_init_key( blake2b_state *S, const uint8_t outlen, const void *key, const uint8_t keylen )
-{
-  if ( ( !outlen ) || ( outlen > BLAKE2B_OUTBYTES ) ) return -1;
-
-  if ( ( !keylen ) || keylen > BLAKE2B_KEYBYTES ) return -1;
-
-  const blake2b_param P =
-  {
-    outlen,
-    keylen,
-    1,
-    1,
-    0,
-    0,
-    0,
-    0,
-    {0},
-    {0},
-    {0}
-  };
-
-  if( blake2b_init_param( S, &P ) < 0 )
-    return 0;
-
-  {
-    uint8_t block[BLAKE2B_BLOCKBYTES];
-    memset( block, 0, BLAKE2B_BLOCKBYTES );
-    memcpy( block, key, keylen );
-    blake2b_update( S, block, BLAKE2B_BLOCKBYTES );
-    secure_zero_memory( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from stack */
-  }
-  return 0;
-}
-
-static inline int blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2B_BLOCKBYTES] )
-{
-  __m128i row1l, row1h;
-  __m128i row2l, row2h;
-  __m128i row3l, row3h;
-  __m128i row4l, row4h;
-  __m128i b0, b1;
-  __m128i t0, t1;
-#if defined(HAVE_SSSE3) && !defined(HAVE_XOP)
-  const __m128i r16 = _mm_setr_epi8( 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9 );
-  const __m128i r24 = _mm_setr_epi8( 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10 );
-#endif
-#if defined(HAVE_SSE41)
-  const __m128i m0 = LOADU( block + 00 );
-  const __m128i m1 = LOADU( block + 16 );
-  const __m128i m2 = LOADU( block + 32 );
-  const __m128i m3 = LOADU( block + 48 );
-  const __m128i m4 = LOADU( block + 64 );
-  const __m128i m5 = LOADU( block + 80 );
-  const __m128i m6 = LOADU( block + 96 );
-  const __m128i m7 = LOADU( block + 112 );
-#else
-  const uint64_t  m0 = ( ( uint64_t * )block )[ 0];
-  const uint64_t  m1 = ( ( uint64_t * )block )[ 1];
-  const uint64_t  m2 = ( ( uint64_t * )block )[ 2];
-  const uint64_t  m3 = ( ( uint64_t * )block )[ 3];
-  const uint64_t  m4 = ( ( uint64_t * )block )[ 4];
-  const uint64_t  m5 = ( ( uint64_t * )block )[ 5];
-  const uint64_t  m6 = ( ( uint64_t * )block )[ 6];
-  const uint64_t  m7 = ( ( uint64_t * )block )[ 7];
-  const uint64_t  m8 = ( ( uint64_t * )block )[ 8];
-  const uint64_t  m9 = ( ( uint64_t * )block )[ 9];
-  const uint64_t m10 = ( ( uint64_t * )block )[10];
-  const uint64_t m11 = ( ( uint64_t * )block )[11];
-  const uint64_t m12 = ( ( uint64_t * )block )[12];
-  const uint64_t m13 = ( ( uint64_t * )block )[13];
-  const uint64_t m14 = ( ( uint64_t * )block )[14];
-  const uint64_t m15 = ( ( uint64_t * )block )[15];
-#endif
-  row1l = LOADU( &S->h[0] );
-  row1h = LOADU( &S->h[2] );
-  row2l = LOADU( &S->h[4] );
-  row2h = LOADU( &S->h[6] );
-  row3l = LOADU( &blake2b_IV[0] );
-  row3h = LOADU( &blake2b_IV[2] );
-  row4l = _mm_xor_si128( LOADU( &blake2b_IV[4] ), LOADU( &S->t[0] ) );
-  row4h = _mm_xor_si128( LOADU( &blake2b_IV[6] ), LOADU( &S->f[0] ) );
-  ROUND( 0 );
-  ROUND( 1 );
-  ROUND( 2 );
-  ROUND( 3 );
-  ROUND( 4 );
-  ROUND( 5 );
-  ROUND( 6 );
-  ROUND( 7 );
-  ROUND( 8 );
-  ROUND( 9 );
-  ROUND( 10 );
-  ROUND( 11 );
-  row1l = _mm_xor_si128( row3l, row1l );
-  row1h = _mm_xor_si128( row3h, row1h );
-  STOREU( &S->h[0], _mm_xor_si128( LOADU( &S->h[0] ), row1l ) );
-  STOREU( &S->h[2], _mm_xor_si128( LOADU( &S->h[2] ), row1h ) );
-  row2l = _mm_xor_si128( row4l, row2l );
-  row2h = _mm_xor_si128( row4h, row2h );
-  STOREU( &S->h[4], _mm_xor_si128( LOADU( &S->h[4] ), row2l ) );
-  STOREU( &S->h[6], _mm_xor_si128( LOADU( &S->h[6] ), row2h ) );
-  return 0;
-}
-
-
-int blake2b_update( blake2b_state *S, const uint8_t *in, uint64_t inlen )
-{
-  while( inlen > 0 )
-  {
-    size_t left = S->buflen;
-    size_t fill = 2 * BLAKE2B_BLOCKBYTES - left;
-
-    if( inlen > fill )
-    {
-      memcpy( S->buf + left, in, fill ); // Fill buffer
-      S->buflen += fill;
-      blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
-      blake2b_compress( S, S->buf ); // Compress
-      memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, BLAKE2B_BLOCKBYTES ); // Shift buffer left
-      S->buflen -= BLAKE2B_BLOCKBYTES;
-      in += fill;
-      inlen -= fill;
-    }
-    else // inlen <= fill
-    {
-      memcpy( S->buf + left, in, inlen );
-      S->buflen += inlen; // Be lazy, do not compress
-      in += inlen;
-      inlen -= inlen;
-    }
-  }
-
-  return 0;
-}
-
-
-int blake2b_final( blake2b_state *S, uint8_t *out, uint8_t outlen )
-{
-  if( outlen > BLAKE2B_OUTBYTES )
-    return -1;
-
-  if( S->buflen > BLAKE2B_BLOCKBYTES )
-  {
-    blake2b_increment_counter( S, BLAKE2B_BLOCKBYTES );
-    blake2b_compress( S, S->buf );
-    S->buflen -= BLAKE2B_BLOCKBYTES;
-    memcpy( S->buf, S->buf + BLAKE2B_BLOCKBYTES, S->buflen );
-  }
-
-  blake2b_increment_counter( S, S->buflen );
-  blake2b_set_lastblock( S );
-  memset( S->buf + S->buflen, 0, 2 * BLAKE2B_BLOCKBYTES - S->buflen ); /* Padding */
-  blake2b_compress( S, S->buf );
-  memcpy( out, &S->h[0], outlen );
-  return 0;
-}
-
-
-int blake2b( uint8_t *out, const void *in, const void *key, const uint8_t outlen, const uint64_t inlen, uint8_t keylen )
-{
-  blake2b_state S[1];
-
-  /* Verify parameters */
-  if ( NULL == in ) return -1;
-
-  if ( NULL == out ) return -1;
-
-  if( NULL == key ) keylen = 0;
-
-  if( keylen )
-  {
-    if( blake2b_init_key( S, outlen, key, keylen ) < 0 ) return -1;
-  }
-  else
-  {
-    if( blake2b_init( S, outlen ) < 0 ) return -1;
-  }
-
-  blake2b_update( S, ( const uint8_t * )in, inlen );
-  blake2b_final( S, out, outlen );
-  return 0;
-}
-
-#if defined(SUPERCOP)
-int crypto_hash( unsigned char *out, unsigned char *in, unsigned long long inlen )
-{
-  return blake2b( out, in, NULL, BLAKE2B_OUTBYTES, inlen, 0 );
-}
-#endif
-
-#if defined(BLAKE2B_SELFTEST)
-#include <string.h>
-#include "blake2-kat.h"
-int main( int argc, char **argv )
-{
-  uint8_t key[BLAKE2B_KEYBYTES];
-  uint8_t buf[KAT_LENGTH];
-
-  for( size_t i = 0; i < BLAKE2B_KEYBYTES; ++i )
-    key[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-    buf[i] = ( uint8_t )i;
-
-  for( size_t i = 0; i < KAT_LENGTH; ++i )
-  {
-    uint8_t hash[BLAKE2B_OUTBYTES];
-    blake2b( hash, buf, key, BLAKE2B_OUTBYTES, i, BLAKE2B_KEYBYTES );
-
-    if( 0 != memcmp( hash, blake2b_keyed_kat[i], BLAKE2B_OUTBYTES ) )
-    {
-      puts( "error" );
-      return -1;
-    }
-  }
-
-  puts( "ok" );
-  return 0;
-}
-#endif
-
-int blake2b_long(uint8_t *out, const void *in, const uint32_t outlen, const uint64_t inlen)
-{
-	blake2b_state blake_state;
-	if (outlen <= BLAKE2B_OUTBYTES)
-	{
-		blake2b_init(&blake_state, outlen);
-		blake2b_update(&blake_state, (const uint8_t*)&outlen, sizeof(uint32_t));
-		blake2b_update(&blake_state, (const uint8_t *)in, inlen);
-		blake2b_final(&blake_state, out, outlen);
-	}
-	else
-	{
-		uint8_t out_buffer[BLAKE2B_OUTBYTES];
-		uint8_t in_buffer[BLAKE2B_OUTBYTES];
-		blake2b_init(&blake_state, BLAKE2B_OUTBYTES);
-		blake2b_update(&blake_state, (const uint8_t*)&outlen, sizeof(uint32_t));
-		blake2b_update(&blake_state, (const uint8_t *)in, inlen);
-		blake2b_final(&blake_state, out_buffer, BLAKE2B_OUTBYTES);
-		memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2);
-		out += BLAKE2B_OUTBYTES / 2;
-		uint32_t toproduce = outlen - BLAKE2B_OUTBYTES / 2;
-		while (toproduce > BLAKE2B_OUTBYTES)
-		{
-			memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES);
-			blake2b(out_buffer, in_buffer, NULL, BLAKE2B_OUTBYTES, BLAKE2B_OUTBYTES, 0);
-			memcpy(out, out_buffer, BLAKE2B_OUTBYTES / 2);
-			out += BLAKE2B_OUTBYTES / 2;
-			toproduce -= BLAKE2B_OUTBYTES / 2;
-		}
-		memcpy(in_buffer, out_buffer, BLAKE2B_OUTBYTES);
-		blake2b(out_buffer, in_buffer, NULL, toproduce, BLAKE2B_OUTBYTES, 0);
-		memcpy(out, out_buffer, toproduce);
-
-	}
-	return 0;
-}
\ No newline at end of file
diff --git a/vendor/equihash/src/pow.cpp b/vendor/equihash/src/pow.cpp
deleted file mode 100644
index 95d6bfb..0000000
--- a/vendor/equihash/src/pow.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-/*Code by Dmitry Khovratovich, 2016
-CC0 license
-
-Modifications by Steemit, Inc. 2016
-*/
-
-#include <equihash/pow.hpp>
-#include <equihash/blake2.h>
-#include <algorithm>
-
-#ifdef EQUIHASH_POW_VERBOSE
-#include <iomanip>
-#include <iostream>
-
-#define EQUIHASH_LOG(s) \
-   std::cerr << s << std::endl;
-#else
-#define EQUIHASH_LOG(s)
-#endif
-
-static uint64_t rdtsc(void) {
-#ifdef _MSC_VER
-    return __rdtsc();
-#else
-#if defined(__amd64__) || defined(__x86_64__)
-    uint64_t rax, rdx;
-    __asm__ __volatile__("rdtsc" : "=a"(rax), "=d"(rdx) : : );
-    return (rdx << 32) | rax;
-#elif defined(__i386__) || defined(__i386) || defined(__X86__)
-    uint64_t rax;
-    __asm__ __volatile__("rdtsc" : "=A"(rax) : : );
-    return rax;
-#else
-#error "Not implemented!"
-#endif
-#endif
-}
-
-
-using namespace _POW;
-using namespace std;
-
-void Equihash::InitializeMemory()
-{
-    uint32_t  tuple_n = ((uint32_t)1) << (n / (k + 1));
-    Tuple default_tuple(k); // k blocks to store (one left for index)
-    std::vector<Tuple> def_tuples(LIST_LENGTH, default_tuple);
-    tupleList = std::vector<std::vector<Tuple>>(tuple_n, def_tuples);
-    filledList= std::vector<unsigned>(tuple_n, 0);
-    solutions.resize(0);
-    forks.resize(0);
-}
-
-void Equihash::FillMemory(uint32_t length) //works for k<=7
-{
-    uint32_t input[SEED_LENGTH + 2];
-    for (unsigned i = 0; i < SEED_LENGTH; ++i)
-        input[i] = seed[i];
-    input[SEED_LENGTH] = nonce;
-    input[SEED_LENGTH + 1] = 0;
-    uint32_t buf[MAX_N / 4];
-    for (unsigned i = 0; i < length; ++i, ++input[SEED_LENGTH + 1]) {
-        blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0);
-        uint32_t index = buf[0] >> (32 - n / (k + 1));
-        unsigned count = filledList[index];
-        if (count < LIST_LENGTH) {
-            for (unsigned j = 1; j < (k + 1); ++j) {
-                //select j-th block of n/(k+1) bits
-                tupleList[index][count].blocks[j - 1] = buf[j] >> (32 - n / (k + 1));
-            }
-            tupleList[index][count].reference = i;
-            filledList[index]++;
-        }
-    }
-}
-
-std::vector<Input> Equihash::ResolveTreeByLevel(Fork fork, unsigned level) {
-    if (level == 0)
-        return std::vector<Input>{fork.ref1, fork.ref2};
-    auto v1 = ResolveTreeByLevel(forks[level - 1][fork.ref1], level - 1);
-    auto v2 = ResolveTreeByLevel(forks[level - 1][fork.ref2], level - 1);
-    v1.insert(v1.end(), v2.begin(), v2.end());
-    return v1;
-}
-
-std::vector<Input> Equihash::ResolveTree(Fork fork) {
-    return ResolveTreeByLevel(fork, forks.size());
-}
-
-
-void Equihash::ResolveCollisions(bool store) {
-    const unsigned tableLength = tupleList.size();  //number of rows in the hashtable
-    const unsigned maxNewCollisions = tupleList.size()*FORK_MULTIPLIER;  //max number of collisions to be found
-    const unsigned newBlocks = tupleList[0][0].blocks.size() - 1;// number of blocks in the future collisions
-    std::vector<Fork> newForks(maxNewCollisions); //list of forks created at this step
-    auto tableRow = vector<Tuple>(LIST_LENGTH, Tuple(newBlocks)); //Row in the hash table
-    vector<vector<Tuple>> collisionList(tableLength,tableRow);
-    std::vector<unsigned> newFilledList(tableLength,0);  //number of entries in rows
-    uint32_t newColls = 0; //collision counter
-    for (unsigned i = 0; i < tableLength; ++i) {
-        for (unsigned j = 0; j < filledList[i]; ++j)        {
-            for (unsigned m = j + 1; m < filledList[i]; ++m) {   //Collision
-                //New index
-                uint32_t newIndex = tupleList[i][j].blocks[0] ^ tupleList[i][m].blocks[0];
-                Fork newFork = Fork(tupleList[i][j].reference, tupleList[i][m].reference);
-                //Check if we get a solution
-                if (store) {  //last step
-                    if (newIndex == 0) {//Solution
-                        std::vector<Input> solution_inputs = ResolveTree(newFork);
-                        solutions.push_back(Proof(n, k, seed, nonce, solution_inputs));
-                    }
-                }
-                else {         //Resolve
-                    if (newFilledList[newIndex] < LIST_LENGTH && newColls < maxNewCollisions) {
-                        for (unsigned l = 0; l < newBlocks; ++l) {
-                            collisionList[newIndex][newFilledList[newIndex]].blocks[l]
-                                = tupleList[i][j].blocks[l+1] ^ tupleList[i][m].blocks[l+1];
-                        }
-                        newForks[newColls] = newFork;
-                        collisionList[newIndex][newFilledList[newIndex]].reference = newColls;
-                        newFilledList[newIndex]++;
-                        newColls++;
-                    }//end of adding collision
-                }
-            }
-        }//end of collision for i
-    }
-    forks.push_back(newForks);
-    std::swap(tupleList, collisionList);
-    std::swap(filledList, newFilledList);
-}
-
-Proof Equihash::FindProof(){
-    this->nonce = 1;
-    while (nonce < MAX_NONCE) {
-        nonce++;
-        uint64_t start_cycles = rdtsc();
-        InitializeMemory(); //allocate
-        FillMemory(4UL << (n / (k + 1)-1));   //fill with hashes
-        uint64_t fill_end = rdtsc();
-        /*fp = fopen("proof.log", "a+");
-        fprintf(fp, "\n===MEMORY FILLED:\n");
-        PrintTuples(fp);
-        fclose(fp);*/
-        for (unsigned i = 1; i <= k; ++i) {
-            uint64_t resolve_start = rdtsc();
-            bool to_store = (i == k);
-            ResolveCollisions(to_store); //XOR collisions, concatenate indices and shift
-            uint64_t resolve_end = rdtsc();
-           /* fp = fopen("proof.log", "a+");
-            fprintf(fp, "\n===RESOLVED AFTER STEP %d:\n", i);
-            PrintTuples(fp);
-            fclose(fp);*/
-        }
-        uint64_t stop_cycles = rdtsc();
-
-        double  mcycles_d = (double)(stop_cycles - start_cycles) / (1UL << 20);
-        uint32_t kbytes = (tupleList.size()*LIST_LENGTH*k*sizeof(uint32_t)) / (1UL << 10);
-
-        //Duplicate check
-        for (unsigned i = 0; i < solutions.size(); ++i) {
-            auto vec = solutions[i].inputs;
-            std::sort(vec.begin(), vec.end());
-            bool dup = false;
-            for (unsigned k = 0; k < vec.size() - 1; ++k) {
-                if (vec[k] == vec[k + 1])
-                    dup = true;
-            }
-            if (!dup)
-            {
-                return solutions[i].CanonizeIndexes();
-            }
-        }
-    }
-    return Proof(n, k, seed, nonce, std::vector<uint32_t>());
-}
-
-/**
- * Added by Steemit, Inc. for single iteration
- */
-Proof Equihash::FindProof( Nonce _nonce )
-{
-    this->nonce = _nonce;
-    InitializeMemory(); //allocate
-    FillMemory(4UL << (n / (k + 1)-1));   //fill with hashes
-
-    for (unsigned i = 1; i <= k; ++i) {
-        bool to_store = (i == k);
-        ResolveCollisions(to_store); //XOR collisions, concatenate indices and shift
-    }
-
-    //Duplicate check
-    for (unsigned i = 0; i < solutions.size(); ++i) {
-       auto vec = solutions[i].inputs;
-       std::sort(vec.begin(), vec.end());
-       bool dup = false;
-       for (unsigned k = 0; k < vec.size() - 1; ++k) {
-             if (vec[k] == vec[k + 1])
-                dup = true;
-       }
-       if (!dup)
-       {
-          return solutions[i].CanonizeIndexes();
-       }
-    }
-
-    return Proof(n, k, seed, nonce, std::vector<uint32_t>());
-}
-
-Proof Proof::CanonizeIndexes()const
-{
-   // We consider the index values in the inputs array to be the leaf nodes of a binary
-   // tree, and the inner nodes to be labelled with the XOR of the corresponding vector
-   // elements.
-   //
-   // Define a binary tree to be canonically sorted if, for each inner node, the least
-   // leaf descendant of the left child is less than the least leaf descendant of the
-   // right child.
-   //
-   // This method puts the inputs into canonical order without altering the inner node
-   // labels.  Thus canonization preserves the validity of the proof and the
-   // footprint of Wagner's algorithm.
-   //
-   // We use a bottom-up traversal, dividing the input into successively larger power-of-2
-   // blocks and swapping the two half-blocks if non-canonical.
-   //
-   // Say a block is least-first if the least element is the first element.
-   //
-   // If each half-block is least-first, the conditional swap ensures the full block will also
-   // be least-first. The half-blocks in the initial iteration are obviously least-first
-   // (they only have a single element!).  So by induction, at each later iteration the half-blocks
-   // of that iteration are least-first (since they were the full blocks of the previous iteration,
-   // which were made least-first by the previous iteration's conditional swap).
-   //
-   // As a consequence, no search is necessary to find the least element in each half-block,
-   // it is always the first element in the half-block.
-
-   std::vector< uint32_t > new_inputs = inputs;
-
-   size_t input_size = inputs.size();
-   size_t half_size = 1;
-   size_t block_size = 2;
-   while( block_size <= input_size )
-   {
-      for( size_t i=0; i+block_size<=input_size; i+=block_size )
-      {
-         auto ita = new_inputs.begin()+i, itb = ita+half_size;
-         if( (*ita) >= (*itb) )
-         {
-            std::swap_ranges( ita, itb, itb );
-         }
-      }
-      half_size = block_size;
-      block_size += block_size;
-   }
-   return Proof(n, k, seed, nonce, new_inputs);
-}
-
-bool Proof::CheckIndexesCanon()const
-{
-   // This method is logically identical to CanonizeIndexes() but will return false
-   // instead of swapping elements.
-
-   size_t input_size = inputs.size();
-   size_t half_size = 1;
-   size_t block_size = 2;
-   while( block_size <= input_size )
-   {
-      for( size_t i=0; i+block_size<=input_size; i+=block_size )
-      {
-         auto ita = inputs.begin()+i, itb = ita+half_size;
-         if( (*ita) >= (*itb) )
-            return false;
-      }
-      half_size = block_size;
-      block_size += block_size;
-   }
-   return true;
-}
-
-bool Proof::Test()
-{
-    uint32_t input[SEED_LENGTH + 2];
-    for (unsigned i = 0; i < SEED_LENGTH; ++i)
-        input[i] = seed[i];
-    input[SEED_LENGTH] = nonce;
-    input[SEED_LENGTH + 1] = 0;
-    uint32_t buf[MAX_N / 4];
-    std::vector<uint32_t> blocks(k+1,0);
-    for (unsigned i = 0; i < inputs.size(); ++i) {
-        input[SEED_LENGTH + 1] = inputs[i];
-        blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0);
-        for (unsigned j = 0; j < (k + 1); ++j) {
-            //select j-th block of n/(k+1) bits
-            blocks[j] ^= buf[j] >> (32 - n / (k + 1));
-        }
-    }
-    bool b = inputs.size() != 0;
-    for (unsigned j = 0; j < (k + 1); ++j) {
-        b &= (blocks[j] == 0);
-    }
-
-    return b;
-}
-
-bool Proof::FullTest()const
-{
-   // Length must be 2**k
-   if( inputs.size() != size_t(1 << k) )
-   {
-      EQUIHASH_LOG( "PoW failed length test" );
-      return false;
-   }
-
-   // Ensure all values are distinct
-   std::vector<Input> sorted_inputs = inputs;
-   std::sort( sorted_inputs.begin(), sorted_inputs.end() );
-   for( size_t i=1; i<inputs.size(); i++ )
-   {
-      if( sorted_inputs[i-1] >= sorted_inputs[i] )
-      {
-         EQUIHASH_LOG( "PoW failed distinct test" );
-         return false;
-      }
-   }
-
-   // Ensure all values are canonically indexed
-   /*
-   if( !CheckIndexesCanon() )
-      return false;
-   */
-
-   // Initialize blocks array
-   uint32_t input[SEED_LENGTH + 2];
-   for( size_t i=0; i<SEED_LENGTH; i++ )
-      input[i] = seed[i];
-   input[SEED_LENGTH] = nonce;
-   input[SEED_LENGTH + 1] = 0;
-   uint32_t buf[MAX_N / 4];
-
-   std::vector< std::vector< uint32_t > > blocks;
-
-   const uint32_t max_input = uint32_t(1) << (n / (k + 1) + 1);
-
-   for( size_t i=0; i<inputs.size(); i++ )
-   {
-      input[SEED_LENGTH + 1] = inputs[i];
-      if( inputs[i] >= max_input )
-      {
-         EQUIHASH_LOG( "PoW failed max_input test" );
-         return false;
-      }
-
-      blake2b((uint8_t*)buf, &input, NULL, sizeof(buf), sizeof(input), 0);
-      blocks.emplace_back();
-      std::vector<uint32_t>& x = blocks.back();
-      x.resize(k+1);
-      for( size_t j=0; j<(k+1); j++ )
-      {
-         //select j-th block of n/(k+1) bits
-         x[j] = buf[j] >> (32 - n / (k + 1));
-      }
-   }
-
-   while( true )
-   {
-#ifdef EQUIHASH_POW_VERBOSE
-      std::cerr << "\n\nBegin loop iteration\n";
-      for( const std::vector< uint32_t >& x : blocks )
-      {
-         for( const uint32_t& e : x )
-            std::cerr << std::hex << std::setw(5) << e << " ";
-         std::cerr << std::endl;
-      }
-#endif
-
-      size_t count = blocks.size();
-      if( count == 0 )
-      {
-         EQUIHASH_LOG( "PoW failed with count == 0" );
-         return false;
-      }
-      if( count == 1 )
-      {
-         if( blocks[0].size() != 1 )
-         {
-            EQUIHASH_LOG( "PoW failed due to vector size" );
-            return false;
-         }
-         if( blocks[0][0] != 0 )
-         {
-            EQUIHASH_LOG( "PoW failed because final bits are not zero" );
-            return false;
-         }
-         return true;
-      }
-      if( (count&1) != 0 )
-      {
-         EQUIHASH_LOG( "PoW failed with odd count" );
-         return false;
-      }
-      for( size_t i=0,new_i=0; i<count; i+=2,new_i++ )
-      {
-         if( blocks[i][0] != blocks[i+1][0] )
-         {
-            EQUIHASH_LOG( "PoW failed because leading element of vector pair does not match" );
-            return false;
-         }
-         for( size_t j=1; j<blocks[i].size(); j++ )
-            blocks[new_i][j-1] = blocks[i][j] ^ blocks[i+1][j];
-         blocks[new_i].resize(blocks[new_i].size()-1);
-      }
-      blocks.resize(blocks.size() >> 1);
-   }
-}

From 895e833edc8b282c82b992d3460490b8013f6c2a Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Thu, 1 Jun 2017 16:47:58 -0500
Subject: [PATCH 098/108] Remove unused FindWt

https://github.com/EOSIO/eos/commit/c2f9a372184b368937adfe4fa286b7842d3d4ca9
---
 CMakeModules/FindWt.cmake | 127 --------------------------------------
 1 file changed, 127 deletions(-)
 delete mode 100755 CMakeModules/FindWt.cmake

diff --git a/CMakeModules/FindWt.cmake b/CMakeModules/FindWt.cmake
deleted file mode 100755
index 094e378..0000000
--- a/CMakeModules/FindWt.cmake
+++ /dev/null
@@ -1,127 +0,0 @@
-# Find Wt includes and libraries
-#
-# This script sets the following variables:
-#
-#  Wt_INCLUDE_DIR
-#  Wt_LIBRARIES  - Release libraries
-#  Wt_FOUND  - True if release libraries found
-#  Wt_DEBUG_LIBRARIES  - Debug libraries
-#  Wt_DEBUG_FOUND  - True if debug libraries found
-#
-# To direct the script to a particular Wt installation, use the
-# standard cmake variables CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH
-#
-# To use this script to find Wt, when using the new style for include files:
-#   #include <Wt/WLineEdit>
-#   #include <Wt/Ext/LineEdit>
-#   #include <Wt/Chart/WPieChart>
-#
-# include the following CMake snippet in your project:
-#
-#  FIND_PACKAGE( Wt REQUIRED )
-#  INCLUDE_DIRECTORIES( ${Wt_INCLUDE_DIR} )
-#  TARGET_LINK_LIBRARIES( yourexe
-#    ${Wt_DEBUG_LIBRARY}        # or {Wt_LIBRARY}
-#    ${Wt_HTTP_DEBUG_LIBRARY}   # or {Wt_HTTP_LIBRARY}
-#    ${Wt_EXT_DEBUG_LIBRARY}    # or {Wt_EXT_LIBRARY}
-#  )
-#
-# To use this script to find Wt, when using the old include style:
-#   #include <WLineEdit>
-#   #include <Ext/LineEdit>
-#   #include <Chart/WPieChart>
-# style of include files, change the INCLUDE_DIRECTORIES statement to:
-#   INCLUDE_DIRECTORIES( ${Wt_INCLUDE_DIR} ${Wt_INCLUDE_DIR}/Wt )
-#
-#
-#
-#
-# Copyright (c) 2007, Pau Garcia i Quiles, <pgquiles@elpauer.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-FIND_PATH( Wt_INCLUDE_DIR NAMES Wt/WObject PATHS ENV PATH PATH_SUFFIXES include wt )
-
-SET( Wt_FIND_COMPONENTS Release Debug )
-
-IF( Wt_INCLUDE_DIR )
-        FIND_LIBRARY( Wt_LIBRARY NAMES wt PATHS PATH PATH_SUFFIXES lib lib-release lib_release )
-        FIND_LIBRARY( Wt_EXT_LIBRARY NAMES wtext PATHS PATH PATH_SUFFIXES lib lib-release lib_release )
-        FIND_LIBRARY( Wt_HTTP_LIBRARY NAMES wthttp PATHS PATH PATH_SUFFIXES lib lib-release lib_release )
-        FIND_LIBRARY( Wt_FCGI_LIBRARY NAMES wtfcgi PATHS PATH PATH_SUFFIXES lib lib-release lib_release )
-        FIND_LIBRARY( Wt_DBO_LIBRARY NAMES wtdbo PATHS PATH PATH_SUFFIXES lib lib-release lib_release )
-        FIND_LIBRARY( Wt_DBOSQLITE3_LIBRARY NAMES wtdbosqlite3 PATHS PATH PATH_SUFFIXES lib lib-release lib_release )
-        FIND_LIBRARY( Wt_DBOPOSTGRES_LIBRARY NAMES wtdbopostgres PATHS PATH PATH_SUFFIXES lib lib-release lib_release )
-
-        FIND_LIBRARY( Wt_DEBUG_LIBRARY NAMES wtd wt PATHS PATH PATH_SUFFIXES lib libd lib-debug lib_debug HINTS /usr/lib/debug/usr/lib)
-        FIND_LIBRARY( Wt_EXT_DEBUG_LIBRARY NAMES wtextd wtext PATHS PATH PATH_SUFFIXES lib libd lib-debug lib_debug HINTS /usr/lib/debug/usr/lib)
-        FIND_LIBRARY( Wt_HTTP_DEBUG_LIBRARY NAMES wthttpd wthttp PATHS PATH PATH_SUFFIXES lib libd lib-debug lib_debug HINTS /usr/lib/debug/usr/lib)
-        FIND_LIBRARY( Wt_FCGI_DEBUG_LIBRARY NAMES wtfcgid wtfcgi PATHS PATH PATH_SUFFIXES lib libd lib-debug lib_debug HINTS /usr/lib/debug/usr/lib)
-        FIND_LIBRARY( Wt_DBO_DEBUG_LIBRARY NAMES wtdbod wtdbo PATHS PATH PATH_SUFFIXES lib lib-debug lib_debug HINTS /usr/lib/debug/usr/lib)
-        FIND_LIBRARY( Wt_DBOSQLITE3_DEBUG_LIBRARY NAMES wtdbosqlite3d wtdbosqlite3 PATHS PATH PATH_SUFFIXES lib lib-debug lib_debug HINTS /usr/lib/debug/usr/lib)
-        FIND_LIBRARY( Wt_DBOPOSTGRES_DEBUG_LIBRARY NAMES wtdbopostgresd wtdbopostgres PATHS PATH PATH_SUFFIXES lib lib-debug lib_debug HINTS /usr/lib/debug/usr/lib)
-
-        IF( Wt_LIBRARY AND Wt_EXT_LIBRARY AND Wt_HTTP_LIBRARY)
-                SET( Wt_FOUND TRUE )
-		SET( Wt_FIND_REQUIRED_Release TRUE )
-                SET( Wt_LIBRARIES ${Wt_HTTP_LIBRARY} ${Wt_EXT_LIBRARY} ${Wt_LIBRARY} )
-        ENDIF( Wt_LIBRARY AND Wt_EXT_LIBRARY AND Wt_HTTP_LIBRARY)
-
-        IF( Wt_DBO_LIBRARY )
-		SET( Wt_LIBRARIES ${Wt_LIBRARIES} ${Wt_DBO_LIBRARY} )
-		IF( Wt_DBOSQLITE3_LIBRARY )
-			SET( Wt_LIBRARIES ${Wt_LIBRARIES} ${Wt_DBOSQLITE3_LIBRARY} )
-		ENDIF( Wt_DBOSQLITE3_LIBRARY )
-		IF( Wt_DBOPOSTGRES_LIBRARY )
-			SET( Wt_LIBRARIES ${Wt_LIBRARIES} ${Wt_DBOPOSTGRES_LIBRARY} )
-		ENDIF( Wt_DBOPOSTGRES_LIBRARY )
-        ENDIF( Wt_DBO_LIBRARY )
-
-	IF( Wt_FCGI_LIBRARY )
-                SET( Wt_LIBRARIES ${Wt_LIBRARIES} ${Wt_FCGI_LIBRARY} )
-        ENDIF( Wt_FCGI_LIBRARY )
-
-        IF( Wt_DEBUG_LIBRARY AND Wt_EXT_DEBUG_LIBRARY AND Wt_HTTP_DEBUG_LIBRARY)
-                SET( Wt_DEBUG_FOUND TRUE )
-		SET( Wt_FIND_REQUIRED_Debug TRUE )
-                SET( Wt_DEBUG_LIBRARIES ${Wt_HTTP_DEBUG_LIBRARY} ${Wt_EXT_DEBUG_LIBRARY} ${Wt_DEBUG_LIBRARY} )
-        ENDIF( Wt_DEBUG_LIBRARY AND Wt_EXT_DEBUG_LIBRARY AND Wt_HTTP_DEBUG_LIBRARY)
-
-        IF( Wt_DBO_DEBUG_LIBRARY )
-		SET( Wt_DEBUG_LIBRARIES ${Wt_DEBUG_LIBRARIES} ${Wt_DBO_DEBUG_LIBRARY} )
-		IF( Wt_DBOSQLITE3_DEBUG_LIBRARY )
-			SET( Wt_DEBUG_LIBRARIES ${Wt_DEBUG_LIBRARIES} ${Wt_DBOSQLITE3_DEBUG_LIBRARY} )
-		ENDIF( Wt_DBOSQLITE3_DEBUG_LIBRARY )
-		IF( Wt_DBOPOSTGRES_DEBUG_LIBRARY )
-			SET( Wt_DEBUG_LIBRARIES ${Wt_DEBUG_LIBRARIES} ${Wt_DBOPOSTGRES_DEBUG_LIBRARY} )
-		ENDIF( Wt_DBOPOSTGRES_DEBUG_LIBRARY )
-        ENDIF( Wt_DBO_DEBUG_LIBRARY )
-
-        IF( Wt_FCGI_DEBUG_LIBRARY )
-                SET( Wt_DEBUG_LIBRARIES ${Wt_DEBUG_LIBRARIES} ${Wt_FCGI_DEBUG_LIBRARY} )
-        ENDIF( Wt_FCGI_DEBUG_LIBRARY )
-
-        IF(Wt_FOUND)
-                IF (NOT Wt_FIND_QUIETLY)
-                        MESSAGE(STATUS "Found the Wt libraries at ${Wt_LIBRARIES}")
-                        MESSAGE(STATUS "Found the Wt headers at ${Wt_INCLUDE_DIR}")
-                ENDIF (NOT Wt_FIND_QUIETLY)
-        ELSE(Wt_FOUND)
-                IF(Wt_FIND_REQUIRED)
-                        MESSAGE(FATAL_ERROR "Could NOT find Wt")
-                ENDIF(Wt_FIND_REQUIRED)
-        ENDIF(Wt_FOUND)
-
-        IF(Wt_DEBUG_FOUND)
-                IF (NOT Wt_FIND_QUIETLY)
-                        MESSAGE(STATUS "Found the Wt debug libraries at ${Wt_DEBUG_LIBRARIES}")
-                        MESSAGE(STATUS "Found the Wt debug headers at ${Wt_INCLUDE_DIR}")
-                ENDIF (NOT Wt_FIND_QUIETLY)
-        ELSE(Wt_DEBUG_FOUND)
-                IF(Wt_FIND_REQUIRED_Debug)
-                        MESSAGE(FATAL_ERROR "Could NOT find Wt debug libraries")
-                ENDIF(Wt_FIND_REQUIRED_Debug)
-        ENDIF(Wt_DEBUG_FOUND)
-
-ENDIF( Wt_INCLUDE_DIR )

From b94a338e56475943eb9bcc79be60ed6afd586796 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Thu, 1 Jun 2017 16:49:10 -0500
Subject: [PATCH 099/108] Add missing include

https://github.com/EOSIO/eos/commit/4643586411a08e5e53851d9f41785b63dc975217
---
 src/log/console_appender.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/log/console_appender.cpp b/src/log/console_appender.cpp
index c012743..9c55ff0 100644
--- a/src/log/console_appender.cpp
+++ b/src/log/console_appender.cpp
@@ -14,6 +14,7 @@
 #include <fc/exception/exception.hpp>
 #include <iomanip>
 #include <sstream>
+#include <mutex>
 
 
 namespace fc {
@@ -27,7 +28,7 @@ namespace fc {
 #endif
    };
 
-   console_appender::console_appender( const variant& args ) 
+   console_appender::console_appender( const variant& args )
    :my(new impl)
    {
       configure( args.as<config>() );
@@ -66,7 +67,7 @@ namespace fc {
    #ifdef WIN32
    static WORD
    #else
-   static const char* 
+   static const char*
    #endif
    get_console_color(console_appender::color::type t ) {
       switch( t ) {
@@ -140,7 +141,7 @@ namespace fc {
       #endif
 
       if( text.size() )
-         fprintf( out, "%s", text.c_str() ); //fmt_str.c_str() ); 
+         fprintf( out, "%s", text.c_str() ); //fmt_str.c_str() );
 
       #ifdef WIN32
       if (my->console_handle != INVALID_HANDLE_VALUE)

From a30647d32e0580217e4bfcb7ccf5493766fcdc0c Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Sun, 4 Jun 2017 17:44:25 -0500
Subject: [PATCH 100/108] Revert "Add OpenSSL 1.1.0 support"

This reverts commit fee06a4c75d3215f9b502f8145383005bdda2c80.

Max compatible Boost version is not compatible with OpenSSL 1.1.0
---
 src/crypto/base58.cpp | 142 ++++++++++++++++++++----------------------
 src/crypto/dh.cpp     |  47 +-------------
 2 files changed, 70 insertions(+), 119 deletions(-)

diff --git a/src/crypto/base58.cpp b/src/crypto/base58.cpp
index 46c9adc..e1d5d33 100644
--- a/src/crypto/base58.cpp
+++ b/src/crypto/base58.cpp
@@ -66,71 +66,74 @@ class CAutoBN_CTX
 
 
 /** C++ wrapper for BIGNUM (OpenSSL bignum) */
-class CBigNum
+class CBigNum : public BIGNUM
 {
-    BIGNUM* bn;
 public:
     CBigNum()
-       : bn(BN_new()) {}
+    {
+        BN_init(this);
+    }
 
     CBigNum(const CBigNum& b)
-       : CBigNum()
     {
-        if (!BN_copy(bn, b.bn))
+        BN_init(this);
+        if (!BN_copy(this, &b))
         {
-            BN_clear_free(bn);
+            BN_clear_free(this);
             throw bignum_error("CBigNum::CBigNum(const CBigNum&) : BN_copy failed");
         }
     }
 
     CBigNum& operator=(const CBigNum& b)
     {
-        if (!BN_copy(bn, b.bn))
+        if (!BN_copy(this, &b))
             throw bignum_error("CBigNum::operator= : BN_copy failed");
         return (*this);
     }
 
     ~CBigNum()
     {
-        BN_clear_free(bn);
+        BN_clear_free(this);
     }
 
     //CBigNum(char n) is not portable.  Use 'signed char' or 'unsigned char'.
-    CBigNum(signed char n)      :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(short n)            :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(int n)              :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(int64_t n)          :CBigNum() { setint64(n); }
-    CBigNum(unsigned char n)    :CBigNum() { setulong(n); }
-    CBigNum(unsigned short n)   :CBigNum() { setulong(n); }
-    CBigNum(unsigned int n)     :CBigNum() { setulong(n); }
-    CBigNum(uint64_t n)         :CBigNum() { setuint64(n); }
+    CBigNum(signed char n)      { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(short n)            { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(int n)              { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
+    //CBigNum(long n)             { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(int64_t n)          { BN_init(this); setint64(n); }
+    CBigNum(unsigned char n)    { BN_init(this); setulong(n); }
+    CBigNum(unsigned short n)   { BN_init(this); setulong(n); }
+    CBigNum(unsigned int n)     { BN_init(this); setulong(n); }
+    //CBigNum(unsigned long n)    { BN_init(this); setulong(n); }
+    CBigNum(uint64_t n)           { BN_init(this); setuint64(n); }
 
     explicit CBigNum(const std::vector<unsigned char>& vch)
-       : CBigNum()
     {
+        BN_init(this);
         setvch(vch);
     }
 
     void setulong(unsigned long n)
     {
-        if (!BN_set_word(bn, n))
+        if (!BN_set_word(this, n))
             throw bignum_error("CBigNum conversion from unsigned long : BN_set_word failed");
     }
 
     unsigned long getulong() const
     {
-        return BN_get_word(bn);
+        return BN_get_word(this);
     }
 
     unsigned int getuint() const
     {
-        return BN_get_word(bn);
+        return BN_get_word(this);
     }
 
     int getint() const
     {
-        unsigned long n = BN_get_word(bn);
-        if (!BN_is_negative(bn))
+        unsigned long n = BN_get_word(this);
+        if (!BN_is_negative(this))
             return (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::max() : n);
         else
             return (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::min() : -(int)n);
@@ -168,7 +171,7 @@ class CBigNum
         pch[1] = (nSize >> 16) & 0xff;
         pch[2] = (nSize >> 8) & 0xff;
         pch[3] = (nSize) & 0xff;
-        BN_mpi2bn(pch, p - pch, bn);
+        BN_mpi2bn(pch, p - pch, this);
     }
 
     void setuint64(uint64_t n)
@@ -195,7 +198,7 @@ class CBigNum
         pch[1] = (nSize >> 16) & 0xff;
         pch[2] = (nSize >> 8) & 0xff;
         pch[3] = (nSize) & 0xff;
-        BN_mpi2bn(pch, p - pch, bn);
+        BN_mpi2bn(pch, p - pch, this);
     }
 
 
@@ -211,16 +214,16 @@ class CBigNum
         vch2[3] = (nSize >> 0) & 0xff;
         // swap data to big endian
         reverse_copy(vch.begin(), vch.end(), vch2.begin() + 4);
-        BN_mpi2bn(&vch2[0], vch2.size(), bn);
+        BN_mpi2bn(&vch2[0], vch2.size(), this);
     }
 
     std::vector<unsigned char> getvch() const
     {
-        unsigned int nSize = BN_bn2mpi(bn, NULL);
+        unsigned int nSize = BN_bn2mpi(this, NULL);
         if (nSize <= 4)
             return std::vector<unsigned char>();
         std::vector<unsigned char> vch(nSize);
-        BN_bn2mpi(bn, &vch[0]);
+        BN_bn2mpi(this, &vch[0]);
         vch.erase(vch.begin(), vch.begin() + 4);
         reverse(vch.begin(), vch.end());
         return vch;
@@ -234,16 +237,16 @@ class CBigNum
         if (nSize >= 1) vch[4] = (nCompact >> 16) & 0xff;
         if (nSize >= 2) vch[5] = (nCompact >> 8) & 0xff;
         if (nSize >= 3) vch[6] = (nCompact >> 0) & 0xff;
-        BN_mpi2bn(&vch[0], vch.size(), bn);
+        BN_mpi2bn(&vch[0], vch.size(), this);
         return *this;
     }
 
     unsigned int GetCompact() const
     {
-        unsigned int nSize = BN_bn2mpi(bn, NULL);
+        unsigned int nSize = BN_bn2mpi(this, NULL);
         std::vector<unsigned char> vch(nSize);
         nSize -= 4;
-        BN_bn2mpi(bn, &vch[0]);
+        BN_bn2mpi(this, &vch[0]);
         unsigned int nCompact = nSize << 24;
         if (nSize >= 1) nCompact |= (vch[4] << 16);
         if (nSize >= 2) nCompact |= (vch[5] << 8);
@@ -278,7 +281,7 @@ class CBigNum
             *this += n;
         }
         if (fNegative)
-            BN_set_negative(bn, 1);
+            *this = 0 - *this;
     }
 
     std::string ToString(int nBase=10) const
@@ -288,20 +291,20 @@ class CBigNum
         CBigNum bn0 = 0;
         std::string str;
         CBigNum bn = *this;
-        BN_set_negative(bn.bn, false);
+        BN_set_negative(&bn, false);
         CBigNum dv;
         CBigNum rem;
-        if (BN_cmp(bn.bn, bn0.bn) == 0)
+        if (BN_cmp(&bn, &bn0) == 0)
             return "0";
-        while (BN_cmp(bn.bn, bn0.bn) > 0)
+        while (BN_cmp(&bn, &bn0) > 0)
         {
-            if (!BN_div(dv.bn, rem.bn, bn.bn, bnBase.bn, pctx))
+            if (!BN_div(&dv, &rem, &bn, &bnBase, pctx))
                 throw bignum_error("CBigNum::ToString() : BN_div failed");
             bn = dv;
             unsigned int c = rem.getulong();
             str += "0123456789abcdef"[c];
         }
-        if (BN_is_negative(this->bn))
+        if (BN_is_negative(this))
             str += "-";
         reverse(str.begin(), str.end());
         return str;
@@ -316,50 +319,45 @@ class CBigNum
 
     bool operator!() const
     {
-        return BN_is_zero(bn);
+        return BN_is_zero(this);
     }
 
     CBigNum& operator+=(const CBigNum& b)
     {
-        if (!BN_add(bn, bn, b.bn))
+        if (!BN_add(this, this, &b))
             throw bignum_error("CBigNum::operator+= : BN_add failed");
         return *this;
     }
 
     CBigNum& operator-=(const CBigNum& b)
     {
-        if (!BN_sub(bn, bn, b.bn))
-            throw bignum_error("CBigNum::operator-= : BN_sub failed");
+        *this = *this - b;
         return *this;
     }
 
     CBigNum& operator*=(const CBigNum& b)
     {
         CAutoBN_CTX pctx;
-        if (!BN_mul(bn, bn, b.bn, pctx))
+        if (!BN_mul(this, this, &b, pctx))
             throw bignum_error("CBigNum::operator*= : BN_mul failed");
         return *this;
     }
 
     CBigNum& operator/=(const CBigNum& b)
     {
-        CAutoBN_CTX pctx;
-        if (!BN_div(bn, NULL, bn, b.bn, pctx))
-            throw bignum_error("CBigNum::operator/= : BN_div failed");
+        *this = *this / b;
         return *this;
     }
 
     CBigNum& operator%=(const CBigNum& b)
     {
-        CAutoBN_CTX pctx;
-        if (!BN_div(NULL, bn, bn, b.bn, pctx))
-            throw bignum_error("CBigNum::operator%= : BN_div failed");
+        *this = *this % b;
         return *this;
     }
 
     CBigNum& operator<<=(unsigned int shift)
     {
-        if (!BN_lshift(bn, bn, shift))
+        if (!BN_lshift(this, this, shift))
             throw bignum_error("CBigNum:operator<<= : BN_lshift failed");
         return *this;
     }
@@ -370,13 +368,13 @@ class CBigNum
         //   if built on ubuntu 9.04 or 9.10, probably depends on version of openssl
         CBigNum a = 1;
         a <<= shift;
-        if (BN_cmp(a.bn, bn) > 0)
+        if (BN_cmp(&a, this) > 0)
         {
             *this = 0;
             return *this;
         }
 
-        if (!BN_rshift(bn, bn, shift))
+        if (!BN_rshift(this, this, shift))
             throw bignum_error("CBigNum:operator>>= : BN_rshift failed");
         return *this;
     }
@@ -385,7 +383,7 @@ class CBigNum
     CBigNum& operator++()
     {
         // prefix operator
-        if (!BN_add(bn, bn, BN_value_one()))
+        if (!BN_add(this, this, BN_value_one()))
             throw bignum_error("CBigNum::operator++ : BN_add failed");
         return *this;
     }
@@ -402,7 +400,7 @@ class CBigNum
     {
         // prefix operator
         CBigNum r;
-        if (!BN_sub(r.bn, bn, BN_value_one()))
+        if (!BN_sub(&r, this, BN_value_one()))
             throw bignum_error("CBigNum::operator-- : BN_sub failed");
         *this = r;
         return *this;
@@ -416,12 +414,10 @@ class CBigNum
         return ret;
     }
 
-    const BIGNUM* to_bignum() const {
-       return bn;
-    }
-    BIGNUM* to_bignum() {
-       return bn;
-    }
+
+    friend inline const CBigNum operator-(const CBigNum& a, const CBigNum& b);
+    friend inline const CBigNum operator/(const CBigNum& a, const CBigNum& b);
+    friend inline const CBigNum operator%(const CBigNum& a, const CBigNum& b);
 };
 
 
@@ -429,7 +425,7 @@ class CBigNum
 inline const CBigNum operator+(const CBigNum& a, const CBigNum& b)
 {
     CBigNum r;
-    if (!BN_add(r.to_bignum(), a.to_bignum(), b.to_bignum()))
+    if (!BN_add(&r, &a, &b))
         throw bignum_error("CBigNum::operator+ : BN_add failed");
     return r;
 }
@@ -437,7 +433,7 @@ inline const CBigNum operator+(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator-(const CBigNum& a, const CBigNum& b)
 {
     CBigNum r;
-    if (!BN_sub(r.to_bignum(), a.to_bignum(), b.to_bignum()))
+    if (!BN_sub(&r, &a, &b))
         throw bignum_error("CBigNum::operator- : BN_sub failed");
     return r;
 }
@@ -445,7 +441,7 @@ inline const CBigNum operator-(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator-(const CBigNum& a)
 {
     CBigNum r(a);
-    BN_set_negative(r.to_bignum(), !BN_is_negative(r.to_bignum()));
+    BN_set_negative(&r, !BN_is_negative(&r));
     return r;
 }
 
@@ -453,7 +449,7 @@ inline const CBigNum operator*(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_mul(r.to_bignum(), a.to_bignum(), b.to_bignum(), pctx))
+    if (!BN_mul(&r, &a, &b, pctx))
         throw bignum_error("CBigNum::operator* : BN_mul failed");
     return r;
 }
@@ -462,7 +458,7 @@ inline const CBigNum operator/(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_div(r.to_bignum(), NULL, a.to_bignum(), b.to_bignum(), pctx))
+    if (!BN_div(&r, NULL, &a, &b, pctx))
         throw bignum_error("CBigNum::operator/ : BN_div failed");
     return r;
 }
@@ -471,7 +467,7 @@ inline const CBigNum operator%(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_mod(r.to_bignum(), a.to_bignum(), b.to_bignum(), pctx))
+    if (!BN_mod(&r, &a, &b, pctx))
         throw bignum_error("CBigNum::operator% : BN_div failed");
     return r;
 }
@@ -479,7 +475,7 @@ inline const CBigNum operator%(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator<<(const CBigNum& a, unsigned int shift)
 {
     CBigNum r;
-    if (!BN_lshift(r.to_bignum(), a.to_bignum(), shift))
+    if (!BN_lshift(&r, &a, shift))
         throw bignum_error("CBigNum:operator<< : BN_lshift failed");
     return r;
 }
@@ -491,12 +487,12 @@ inline const CBigNum operator>>(const CBigNum& a, unsigned int shift)
     return r;
 }
 
-inline bool operator==(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) == 0); }
-inline bool operator!=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) != 0); }
-inline bool operator<=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) <= 0); }
-inline bool operator>=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) >= 0); }
-inline bool operator<(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(a.to_bignum(), b.to_bignum()) < 0); }
-inline bool operator>(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(a.to_bignum(), b.to_bignum()) > 0); }
+inline bool operator==(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) == 0); }
+inline bool operator!=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) != 0); }
+inline bool operator<=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) <= 0); }
+inline bool operator>=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) >= 0); }
+inline bool operator<(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(&a, &b) < 0); }
+inline bool operator>(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(&a, &b) > 0); }
 
 
 static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
@@ -526,7 +522,7 @@ inline std::string EncodeBase58(const unsigned char* pbegin, const unsigned char
     CBigNum rem;
     while (bn > bn0)
     {
-        if (!BN_div(dv.to_bignum(), rem.to_bignum(), bn.to_bignum(), bn58.to_bignum(), pctx))
+        if (!BN_div(&dv, &rem, &bn, &bn58, pctx))
             throw bignum_error("EncodeBase58 : BN_div failed");
         bn = dv;
         unsigned int c = rem.getulong();
@@ -576,7 +572,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet)
             break;
         }
         bnChar.setulong(p1 - pszBase58);
-        if (!BN_mul(bn.to_bignum(), bn.to_bignum(), bn58.to_bignum(), pctx))
+        if (!BN_mul(&bn, &bn, &bn58, pctx))
             throw bignum_error("DecodeBase58 : BN_mul failed");
         bn += bnChar;
     }
diff --git a/src/crypto/dh.cpp b/src/crypto/dh.cpp
index e7f6c59..cbd7dcc 100644
--- a/src/crypto/dh.cpp
+++ b/src/crypto/dh.cpp
@@ -1,9 +1,6 @@
 #include <fc/crypto/dh.hpp>
 #include <openssl/dh.h>
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-#endif
-
 namespace fc {
     SSL_TYPE(ssl_dh, DH, DH_free)
 
@@ -15,19 +12,10 @@ namespace fc {
 
    bool diffie_hellman::generate_params( int s, uint8_t g )
    {
-        ssl_dh dh;
-        DH_generate_parameters_ex(dh.obj, s, g, NULL);
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-        ssl_bignum bn_p;
-        DH_get0_pqg(dh.obj, (const BIGNUM**)&bn_p.obj, NULL, NULL);
-        p.resize( BN_num_bytes( bn_p ) );
-        if( p.size() )
-            BN_bn2bin( bn_p, (unsigned char*)&p.front()  );
-#else
+        ssl_dh dh = DH_generate_parameters( s, g, NULL, NULL );
         p.resize( BN_num_bytes( dh->p ) );
         if( p.size() )
             BN_bn2bin( dh->p, (unsigned char*)&p.front()  );
-#endif
         this->g = g;
         return fc::validate( dh, valid );
    }
@@ -37,14 +25,8 @@ namespace fc {
         if( !p.size() ) 
             return valid = false;
         ssl_dh dh = DH_new();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-        const auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
-        const auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
-        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
-#else
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
-#endif
         return fc::validate( dh, valid );
    }
 
@@ -53,14 +35,8 @@ namespace fc {
         if( !p.size() ) 
             return valid = false;
         ssl_dh dh = DH_new();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-        const auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
-        const auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
-        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
-#else
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
-#endif
 
         if( !fc::validate( dh, valid ) )
         {
@@ -68,42 +44,21 @@ namespace fc {
         }
         DH_generate_key(dh);
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-        ssl_bignum bn_pub_key;
-        ssl_bignum bn_priv_key;
-        DH_get0_key(dh.obj, (const BIGNUM**)&bn_pub_key.obj, (const BIGNUM**)&bn_priv_key.obj);
-        pub_key.resize( BN_num_bytes( bn_pub_key ) );
-        priv_key.resize( BN_num_bytes( bn_priv_key ) );
-        if( pub_key.size() )
-            BN_bn2bin( bn_pub_key.obj, (unsigned char*)&pub_key.front()  );
-        if( priv_key.size() )
-            BN_bn2bin( bn_priv_key.obj, (unsigned char*)&priv_key.front()  );
-#else
         pub_key.resize( BN_num_bytes( dh->pub_key ) );
         priv_key.resize( BN_num_bytes( dh->priv_key ) );
         if( pub_key.size() )
             BN_bn2bin( dh->pub_key, (unsigned char*)&pub_key.front()  );
         if( priv_key.size() )
             BN_bn2bin( dh->priv_key, (unsigned char*)&priv_key.front()  );
-#endif
 
         return true;
    }
    bool diffie_hellman::compute_shared_key( const char* buf, uint32_t s ) {
         ssl_dh dh = DH_new();
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
-        auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
-        auto bn_pub_key = BN_bin2bn( (unsigned char*)&pub_key.front(), pub_key.size(), NULL );
-        auto bn_priv_key = BN_bin2bn( (unsigned char*)&priv_key.front(), priv_key.size(), NULL );
-        auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
-        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
-        DH_set0_key(dh.obj, bn_pub_key, bn_priv_key);
-#else
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->pub_key = BN_bin2bn( (unsigned char*)&pub_key.front(), pub_key.size(), NULL );
         dh->priv_key = BN_bin2bn( (unsigned char*)&priv_key.front(), priv_key.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
-#endif
 
         int check;
         DH_check(dh,&check);

From cb627980a5ff5f65fe129414dd96d3c2bd51b095 Mon Sep 17 00:00:00 2001
From: Vikram Rajkumar <vikram@soledger.com>
Date: Sun, 4 Jun 2017 18:13:13 -0500
Subject: [PATCH 101/108] Remove unused CyoEncode and Base32

https://github.com/EOSIO/eos/commit/5c466150ecea814af2bf8a7f7ccea6a3d2179999
---
 CMakeLists.txt                                |   4 -
 include/fc/crypto/base32.hpp                  |  10 -
 src/crypto/base32.cpp                         |  29 --
 tests/crypto/base_n_tests.cpp                 |  24 --
 vendor/cyoencode-1.0.2/LICENSE.TXT            |  27 --
 vendor/cyoencode-1.0.2/README.TXT             |  50 ---
 vendor/cyoencode-1.0.2/src/CyoDecode.c        | 398 ------------------
 vendor/cyoencode-1.0.2/src/CyoDecode.h        |  58 ---
 vendor/cyoencode-1.0.2/src/CyoEncode.c        | 283 -------------
 vendor/cyoencode-1.0.2/src/CyoEncode.h        |  55 ---
 vendor/cyoencode-1.0.2/src/build.sh           |   2 -
 .../src/cyoencode-vc100.vcxproj               | 162 -------
 .../cyoencode-1.0.2/src/cyoencode-vc71.vcproj | 129 ------
 .../cyoencode-1.0.2/src/cyoencode-vc80.vcproj | 195 ---------
 .../cyoencode-1.0.2/src/cyoencode-vc90.vcproj | 341 ---------------
 vendor/cyoencode-1.0.2/src/test.c             | 191 ---------
 16 files changed, 1958 deletions(-)
 delete mode 100644 include/fc/crypto/base32.hpp
 delete mode 100644 src/crypto/base32.cpp
 delete mode 100644 vendor/cyoencode-1.0.2/LICENSE.TXT
 delete mode 100644 vendor/cyoencode-1.0.2/README.TXT
 delete mode 100644 vendor/cyoencode-1.0.2/src/CyoDecode.c
 delete mode 100644 vendor/cyoencode-1.0.2/src/CyoDecode.h
 delete mode 100644 vendor/cyoencode-1.0.2/src/CyoEncode.c
 delete mode 100644 vendor/cyoencode-1.0.2/src/CyoEncode.h
 delete mode 100755 vendor/cyoencode-1.0.2/src/build.sh
 delete mode 100644 vendor/cyoencode-1.0.2/src/cyoencode-vc100.vcxproj
 delete mode 100644 vendor/cyoencode-1.0.2/src/cyoencode-vc71.vcproj
 delete mode 100644 vendor/cyoencode-1.0.2/src/cyoencode-vc80.vcproj
 delete mode 100644 vendor/cyoencode-1.0.2/src/cyoencode-vc90.vcproj
 delete mode 100644 vendor/cyoencode-1.0.2/src/test.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62b579d..1f7787d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -207,7 +207,6 @@ set( fc_sources
      src/crypto/aes.cpp
      src/crypto/crc.cpp
      src/crypto/city.cpp
-     src/crypto/base32.cpp
      src/crypto/base36.cpp
      src/crypto/base58.cpp
      src/crypto/base64.cpp
@@ -235,8 +234,6 @@ set( fc_sources
      src/network/url.cpp
      src/compress/smaz.cpp
      src/compress/zlib.cpp
-     vendor/cyoencode-1.0.2/src/CyoDecode.c
-     vendor/cyoencode-1.0.2/src/CyoEncode.c
      )
 
 file( GLOB_RECURSE fc_headers ${CMAKE_CURRENT_SOURCE_DIR} *.hpp *.h )
@@ -369,7 +366,6 @@ target_include_directories(fc
 
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/cyoencode-1.0.2/src
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
   )
 
diff --git a/include/fc/crypto/base32.hpp b/include/fc/crypto/base32.hpp
deleted file mode 100644
index 15bf169..0000000
--- a/include/fc/crypto/base32.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#pragma once
-#include <fc/vector.hpp>
-#include <fc/string.hpp>
-
-namespace fc
-{
-    std::vector<char> from_base32( const fc::string& b32 );
-    fc::string to_base32( const std::vector<char>& vec );
-    fc::string to_base32( const char* data, size_t len );
-}
diff --git a/src/crypto/base32.cpp b/src/crypto/base32.cpp
deleted file mode 100644
index bb5354d..0000000
--- a/src/crypto/base32.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <fc/crypto/base32.hpp>
-#include <CyoDecode.h>
-#include <CyoEncode.h>
-namespace fc
-{
-    std::vector<char> from_base32( const std::string& b32 )
-    {
-       auto len = cyoBase32DecodeGetLength( b32.size() );
-       std::vector<char> v(len);
-       len = cyoBase32Decode( v.data(), b32.c_str(), b32.size() );
-       v.resize( len );
-       return v;
-    }
-
-    std::string to_base32( const char* data, size_t len )
-    { 
-       auto s = cyoBase32EncodeGetLength(len);
-       std::vector<char> b32;
-       b32.resize(s);
-       cyoBase32Encode( b32.data(), data, len );
-       b32.resize( b32.size()-1); // strip the nullterm
-       return std::string(b32.begin(),b32.end());
-    }
-
-    std::string to_base32( const std::vector<char>& vec )
-    {
-       return to_base32( vec.data(), vec.size() );
-    }
-}
diff --git a/tests/crypto/base_n_tests.cpp b/tests/crypto/base_n_tests.cpp
index a501123..4ec3c1d 100644
--- a/tests/crypto/base_n_tests.cpp
+++ b/tests/crypto/base_n_tests.cpp
@@ -1,7 +1,6 @@
 #include <boost/test/unit_test.hpp>
 
 #include <fc/crypto/hex.hpp>
-#include <fc/crypto/base32.hpp>
 #include <fc/crypto/base36.hpp>
 #include <fc/crypto/base58.hpp>
 #include <fc/crypto/base64.hpp>
@@ -44,29 +43,6 @@ BOOST_AUTO_TEST_CASE(hex_test)
 }
 
 
-static void test_32( const std::string& test, const std::string& expected )
-{
-    std::vector<char> vec( test.begin(), test.end() );
-    fc::string enc1 = fc::to_base32( vec );
-    fc::string enc2 = fc::to_base32( test.c_str(), test.size() );
-    BOOST_CHECK_EQUAL( enc1, enc2 );
-    BOOST_CHECK_EQUAL( expected, enc2 );
-
-    std::vector<char> dec = fc::from_base32( enc1 );
-    BOOST_CHECK_EQUAL( vec.size(), dec.size() );
-    BOOST_CHECK( !memcmp( vec.data(), dec.data(), vec.size() ) );
-}
-
-BOOST_AUTO_TEST_CASE(base32_test)
-{
-    test_32( TEST1, "" );
-    test_32( TEST2, "AAATAMI=" );
-    test_32( TEST3, "IFBEGRCFIZDUQSKKJNGE2TSPKBIVEU2UKVLFOWCZLI======" );
-    test_32( TEST4, "777AB7IB7Q======" );
-    test_32( TEST5, "AAAAA===" );
-}
-
-
 static void test_36( const std::string& test, const std::string& expected )
 {
     std::vector<char> vec( test.begin(), test.end() );
diff --git a/vendor/cyoencode-1.0.2/LICENSE.TXT b/vendor/cyoencode-1.0.2/LICENSE.TXT
deleted file mode 100644
index 4e10e73..0000000
--- a/vendor/cyoencode-1.0.2/LICENSE.TXT
+++ /dev/null
@@ -1,27 +0,0 @@
-All the files in this library are covered under the terms of the Berkeley
-Software Distribution (BSD) License:
-
-Copyright (c) 2009-2012, Graham Bull.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/vendor/cyoencode-1.0.2/README.TXT b/vendor/cyoencode-1.0.2/README.TXT
deleted file mode 100644
index 30df17d..0000000
--- a/vendor/cyoencode-1.0.2/README.TXT
+++ /dev/null
@@ -1,50 +0,0 @@
-===============================================================================
-CyoEncode
-http://cyoencode.sourceforge.net/
-
-Copyright (c) 2009-2012, Graham Bull. All rights reserved.
-===============================================================================
-
-Version 1.0.2
-Release Date 5th January 2012
-
--------------------------------------------------------------------------------
-1. License
--------------------------------------------------------------------------------
-
-CyoEncode is made available under the terms of the Berkeley Software
-Distribution (BSD) licence, as detailed in LICENSE.TXT. This allows you
-complete freedom to use and distribute the code in source and/or binary form,
-as long as you respect the original copyright.
-
--------------------------------------------------------------------------------
-2. Instructions
--------------------------------------------------------------------------------
-
-Simply copy the required source files (CyoEncode.h/cpp and CyoDecode.h/cpp)
-into your C/C++ project.
-
-Examples of usage can be found in the test.c file.
-
-For Unix/Linux developers, there's a shell script that will build the test
-using GCC.
-
-For Windows developers, Visual Studio projects are included.
-
--------------------------------------------------------------------------------
-3. Release Notes
--------------------------------------------------------------------------------
-
-1.0.2 - 5th January 2012
-- A little refactoring, added some shared functions.
-- Added VS42010 project file.
-- Added x64 build configurations.
-
-1.0.1 - 25th September 2009
-- Added the cyoBase??Validate() functions.
-- Added detection of invalid encodings in the cyoBase??Decode() functions,
-  rather than relying on assertions.
-
-1.0.0 - 19th August 2009
-- First release.
-
diff --git a/vendor/cyoencode-1.0.2/src/CyoDecode.c b/vendor/cyoencode-1.0.2/src/CyoDecode.c
deleted file mode 100644
index d40e3a8..0000000
--- a/vendor/cyoencode-1.0.2/src/CyoDecode.c
+++ /dev/null
@@ -1,398 +0,0 @@
-/*
- * CyoDecode.c - part of the CyoEncode library
- *
- * Copyright (c) 2009-2012, Graham Bull.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  * Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "CyoDecode.h"
-
-#include <assert.h>
-
-#include <stdio.h> //TEMP
-
-/********************************** Shared ***********************************/
-
-static int cyoBaseXXValidate( const char* src, size_t size, size_t inputBytes, size_t maxPadding,
-                              unsigned char maxValue, const unsigned char table[] )
-{
-    /*
-     * returns 0 if the source is a valid baseXX encoding
-     */
-
-    if (!src)
-        return -1; /*ERROR - NULL pointer*/
-
-    if (size % inputBytes != 0)
-        return -1; /*ERROR - extra characters*/
-
-    /* check the bytes */
-    for (; size >= 1; --size, ++src)
-    {
-        unsigned char ch = *src;
-        if ((ch >= 0x80) || (table[ ch ] > maxValue))
-            break;
-    }
-
-    /* check any padding */
-    for (; 1 <= size && size <= maxPadding; --size, ++src)
-    {
-        unsigned char ch = *src;
-        if ((ch >= 0x80) || (table[ ch ] != maxValue + 1))
-            break;
-    }
-
-    /* if size isn't zero then the encoded string isn't valid */
-    if (size != 0)
-        return -2; /*ERROR - invalid baseXX character*/
-
-    /* OK */
-    return 0;
-}
-
-static size_t cyoBaseXXDecodeGetLength( size_t size, size_t inputBytes, size_t outputBytes )
-{
-    if (size % inputBytes != 0)
-        return 0; /*ERROR - extra characters*/
-
-    /* OK */
-    return (((size + inputBytes - 1) / inputBytes) * outputBytes) + 1; /*plus terminator*/
-}
-
-/****************************** Base16 Decoding ******************************/
-
-static const size_t BASE16_INPUT = 2;
-static const size_t BASE16_OUTPUT = 1;
-static const size_t BASE16_MAX_PADDING = 0;
-static const unsigned char BASE16_MAX_VALUE = 15;
-static const unsigned char BASE16_TABLE[ 0x80 ] = {
-    /*00-07*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*08-0f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*10-17*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*18-1f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*20-27*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*28-2f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*30-37*/ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, /*8 = '0'-'7'*/
-    /*38-3f*/ 0x08, 0x09, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /*2 = '8'-'9'*/
-    /*40-47*/ 0xFF, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0xFF, /*6 = 'A'-'F'*/
-    /*48-4f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*50-57*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*58-5f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*60-67*/ 0xFF, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0xFF, /*6 = 'a'-'f' (same as 'A'-'F')*/
-    /*68-6f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*70-77*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*78-7f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
-};
-
-int cyoBase16Validate( const char* src, size_t size )
-{
-    return cyoBaseXXValidate( src, size, BASE16_INPUT, BASE16_MAX_PADDING, BASE16_MAX_VALUE, BASE16_TABLE );
-}
-
-size_t cyoBase16DecodeGetLength( size_t size )
-{
-    return cyoBaseXXDecodeGetLength( size, BASE16_INPUT, BASE16_OUTPUT );
-}
-
-size_t cyoBase16Decode( void* dest, const char* src, size_t size )
-{
-    /*
-     * output 1 byte for every 2 input:
-     *
-     *               outputs: 1
-     * inputs: 1 = ----1111 = 1111----
-     *         2 = ----2222 = ----2222
-     */
-
-    if (dest && src && (size % BASE16_INPUT == 0))
-    {
-        unsigned char* pDest = (unsigned char*)dest;
-        size_t dwSrcSize = size;
-        size_t dwDestSize = 0;
-        unsigned char in1, in2;
-
-        while (dwSrcSize >= 1)
-        {
-            /* 2 inputs */
-            in1 = *src++;
-            in2 = *src++;
-            dwSrcSize -= BASE16_INPUT;
-
-            /* Validate ascii */
-            if (in1 >= 0x80 || in2 >= 0x80)
-                return 0; /*ERROR - invalid base16 character*/
-
-            /* Convert ascii to base16 */
-            in1 = BASE16_TABLE[ in1 ];
-            in2 = BASE16_TABLE[ in2 ];
-
-            /* Validate base16 */
-            if (in1 > BASE16_MAX_VALUE || in2 > BASE16_MAX_VALUE)
-                return 0; /*ERROR - invalid base16 character*/
-
-            /* 1 output */
-            *pDest++ = ((in1 << 4) | in2);
-            dwDestSize += BASE16_OUTPUT;
-        }
-        *pDest++ = '\x0'; /*append terminator*/
-
-        return dwDestSize;
-    }
-    else
-        return 0; /*ERROR - null pointer, or size isn't a multiple of 2*/
-}
-
-/****************************** Base32 Decoding ******************************/
-
-static const size_t BASE32_INPUT = 8;
-static const size_t BASE32_OUTPUT = 5;
-static const size_t BASE32_MAX_PADDING = 6;
-static const unsigned char BASE32_MAX_VALUE = 31;
-static const unsigned char BASE32_TABLE[ 0x80 ] = {
-    /*00-07*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*08-0f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*10-17*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*18-1f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*20-27*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*28-2f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*30-37*/ 0xFF, 0xFF, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, /*6 = '2'-'7'*/
-    /*38-3f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x20, 0xFF, 0xFF, /*1 = '='*/
-    /*40-47*/ 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, /*7 = 'A'-'G'*/
-    /*48-4f*/ 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, /*8 = 'H'-'O'*/
-    /*50-57*/ 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, /*8 = 'P'-'W'*/
-    /*58-5f*/ 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /*3 = 'X'-'Z'*/
-    /*60-67*/ 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, /*7 = 'a'-'g' (same as 'A'-'G')*/
-    /*68-6f*/ 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, /*8 = 'h'-'o' (same as 'H'-'O')*/
-    /*70-77*/ 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, /*8 = 'p'-'w' (same as 'P'-'W')*/
-    /*78-7f*/ 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF  /*3 = 'x'-'z' (same as 'X'-'Z')*/
-};
-
-int cyoBase32Validate( const char* src, size_t size )
-{
-    return cyoBaseXXValidate( src, size, BASE32_INPUT, BASE32_MAX_PADDING, BASE32_MAX_VALUE, BASE32_TABLE );
-}
-
-size_t cyoBase32DecodeGetLength( size_t size )
-{
-    return cyoBaseXXDecodeGetLength( size, BASE32_INPUT, BASE32_OUTPUT );
-}
-
-size_t cyoBase32Decode( void* dest, const char* src, size_t size )
-{
-    /*
-     * output 5 bytes for every 8 input:
-     *
-     *               outputs: 1        2        3        4        5
-     * inputs: 1 = ---11111 = 11111---
-     *         2 = ---222XX = -----222 XX------
-     *         3 = ---33333 =          --33333-
-     *         4 = ---4XXXX =          -------4 XXXX----
-     *         5 = ---5555X =                   ----5555 X-------
-     *         6 = ---66666 =                            -66666--
-     *         7 = ---77XXX =                            ------77 XXX-----
-     *         8 = ---88888 =                                     ---88888
-     */
-
-    if (dest && src && (size % BASE32_INPUT == 0))
-    {
-        unsigned char* pDest = (unsigned char*)dest;
-        size_t dwSrcSize = size;
-        size_t dwDestSize = 0;
-        unsigned char in1, in2, in3, in4, in5, in6, in7, in8;
-
-        while (dwSrcSize >= 1)
-        {
-            /* 8 inputs */
-            in1 = *src++;
-            in2 = *src++;
-            in3 = *src++;
-            in4 = *src++;
-            in5 = *src++;
-            in6 = *src++;
-            in7 = *src++;
-            in8 = *src++;
-            dwSrcSize -= BASE32_INPUT;
-
-            /* Validate ascii */
-            if (   in1 >= 0x80 || in2 >= 0x80 || in3 >= 0x80 || in4 >= 0x80
-                || in5 >= 0x80 || in6 >= 0x80 || in7 >= 0x80 || in8 >= 0x80)
-                return 0; /*ERROR - invalid base32 character*/
-
-            /* Convert ascii to base16 */
-            in1 = BASE32_TABLE[ in1 ];
-            in2 = BASE32_TABLE[ in2 ];
-            in3 = BASE32_TABLE[ in3 ];
-            in4 = BASE32_TABLE[ in4 ];
-            in5 = BASE32_TABLE[ in5 ];
-            in6 = BASE32_TABLE[ in6 ];
-            in7 = BASE32_TABLE[ in7 ];
-            in8 = BASE32_TABLE[ in8 ];
-
-            /* Validate base32 */
-            if (in1 > BASE32_MAX_VALUE || in2 > BASE32_MAX_VALUE)
-                return 0; /*ERROR - invalid base32 character*/
-            /*the following can be padding*/
-            if (   in3 > BASE32_MAX_VALUE + 1 || in4 > BASE32_MAX_VALUE + 1 || in5 > BASE32_MAX_VALUE + 1
-                || in6 > BASE32_MAX_VALUE + 1 || in7 > BASE32_MAX_VALUE + 1 || in8 > BASE32_MAX_VALUE + 1)
-                return 0; /*ERROR - invalid base32 character*/
-
-            /* 5 outputs */
-            *pDest++ = ((in1 & 0x1f) << 3) | ((in2 & 0x1c) >> 2);
-            *pDest++ = ((in2 & 0x03) << 6) | ((in3 & 0x1f) << 1) | ((in4 & 0x10) >> 4);
-            *pDest++ = ((in4 & 0x0f) << 4) | ((in5 & 0x1e) >> 1);
-            *pDest++ = ((in5 & 0x01) << 7) | ((in6 & 0x1f) << 2) | ((in7 & 0x18) >> 3);
-            *pDest++ = ((in7 & 0x07) << 5) | (in8 & 0x1f);
-            dwDestSize += BASE32_OUTPUT;
-
-            /* Padding */
-            if (in8 == BASE32_MAX_VALUE + 1)
-            {
-                --dwDestSize;
-                assert( (in7 == BASE32_MAX_VALUE + 1 && in6 == BASE32_MAX_VALUE + 1) || (in7 != BASE32_MAX_VALUE + 1) );
-                if (in6 == BASE32_MAX_VALUE + 1)
-                {
-                    --dwDestSize;
-                    if (in5 == BASE32_MAX_VALUE + 1)
-                    {
-                        --dwDestSize;
-                        assert( (in4 == BASE32_MAX_VALUE + 1 && in3 == BASE32_MAX_VALUE + 1) || (in4 != BASE32_MAX_VALUE + 1) );
-                        if (in3 == BASE32_MAX_VALUE + 1)
-                        {
-                            --dwDestSize;
-                        }
-                    }
-                }
-            }
-        }
-        *pDest++ = '\x0'; /*append terminator*/
-
-        return dwDestSize;
-    }
-    else
-        return 0; /*ERROR - null pointer, or size isn't a multiple of 8*/
-}
-
-/****************************** Base64 Decoding ******************************/
-
-static const size_t BASE64_INPUT = 4;
-static const size_t BASE64_OUTPUT = 3;
-static const size_t BASE64_MAX_PADDING = 2;
-static const unsigned char BASE64_MAX_VALUE = 63;
-static const unsigned char BASE64_TABLE[ 0x80 ] = {
-    /*00-07*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*08-0f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*10-17*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*18-1f*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*20-27*/ 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
-    /*28-2f*/ 0xFF, 0xFF, 0xFF, 0x3e, 0xFF, 0xFF, 0xFF, 0x3f, /*2 = '+' and '/'*/
-    /*30-37*/ 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, /*8 = '0'-'7'*/
-    /*38-3f*/ 0x3c, 0x3d, 0xFF, 0xFF, 0xFF, 0x40, 0xFF, 0xFF, /*2 = '8'-'9' and '='*/
-    /*40-47*/ 0xFF, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, /*7 = 'A'-'G'*/
-    /*48-4f*/ 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, /*8 = 'H'-'O'*/
-    /*50-57*/ 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, /*8 = 'P'-'W'*/
-    /*58-5f*/ 0x17, 0x18, 0x19, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, /*3 = 'X'-'Z'*/
-    /*60-67*/ 0xFF, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, /*7 = 'a'-'g'*/
-    /*68-6f*/ 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, /*8 = 'h'-'o'*/
-    /*70-77*/ 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30, /*8 = 'p'-'w'*/
-    /*78-7f*/ 0x31, 0x32, 0x33, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF  /*3 = 'x'-'z'*/
-};
-
-int cyoBase64Validate( const char* src, size_t size )
-{
-    return cyoBaseXXValidate( src, size, BASE64_INPUT, BASE64_MAX_PADDING, BASE64_MAX_VALUE, BASE64_TABLE );
-}
-
-size_t cyoBase64DecodeGetLength( size_t size )
-{
-    return cyoBaseXXDecodeGetLength( size, BASE64_INPUT, BASE64_OUTPUT );
-}
-
-size_t cyoBase64Decode( void* dest, const char* src, size_t size )
-{
-    /*
-     * output 3 bytes for every 4 input:
-     *
-     *               outputs: 1        2        3
-     * inputs: 1 = --111111 = 111111--
-     *         2 = --22XXXX = ------22 XXXX----
-     *         3 = --3333XX =          ----3333 XX------
-     *         4 = --444444 =                   --444444
-     */
-
-    if (dest && src && (size % BASE64_INPUT == 0))
-    {
-        unsigned char* pDest = (unsigned char*)dest;
-        size_t dwSrcSize = size;
-        size_t dwDestSize = 0;
-        unsigned char in1, in2, in3, in4;
-
-        while (dwSrcSize >= 1)
-        {
-            /* 4 inputs */
-            in1 = *src++;
-            in2 = *src++;
-            in3 = *src++;
-            in4 = *src++;
-            dwSrcSize -= BASE64_INPUT;
-
-            /* Validate ascii */
-            if (in1 >= 0x80 || in2 >= 0x80 || in3 >= 0x80 || in4 >= 0x80)
-                return 0; /*ERROR - invalid base64 character*/
-
-            /* Convert ascii to base64 */
-            in1 = BASE64_TABLE[ in1 ];
-            in2 = BASE64_TABLE[ in2 ];
-            in3 = BASE64_TABLE[ in3 ];
-            in4 = BASE64_TABLE[ in4 ];
-
-            /* Validate base64 */
-            if (in1 > BASE64_MAX_VALUE || in2 > BASE64_MAX_VALUE)
-                return 0; /*ERROR - invalid base64 character*/
-            /*the following can be padding*/
-            if (in3 > BASE64_MAX_VALUE + 1 || in4 > BASE64_MAX_VALUE + 1)
-                return 0; /*ERROR - invalid base64 character*/
-
-            /* 3 outputs */
-            *pDest++ = ((in1 & 0x3f) << 2) | ((in2 & 0x30) >> 4);
-            *pDest++ = ((in2 & 0x0f) << 4) | ((in3 & 0x3c) >> 2);
-            *pDest++ = ((in3 & 0x03) << 6) | (in4 & 0x3f);
-            dwDestSize += BASE64_OUTPUT;
-
-            /* Padding */
-            if (in4 == BASE64_MAX_VALUE + 1)
-            {
-                --dwDestSize;
-                if (in3 == BASE64_MAX_VALUE + 1)
-                {
-                    --dwDestSize;
-                }
-            }
-        }
-        *pDest++ = '\x0'; /*append terminator*/
-
-        return dwDestSize;
-    }
-    else
-        return 0; /*ERROR - null pointer, or size isn't a multiple of 4*/
-}
diff --git a/vendor/cyoencode-1.0.2/src/CyoDecode.h b/vendor/cyoencode-1.0.2/src/CyoDecode.h
deleted file mode 100644
index 873ed20..0000000
--- a/vendor/cyoencode-1.0.2/src/CyoDecode.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * CyoDecode.h - part of the CyoEncode library
- *
- * Copyright (c) 2009-2012, Graham Bull.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  * Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __CYODECODE_H
-#define __CYODECODE_H
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Base16 Decoding */
-int    cyoBase16Validate( const char* src, size_t size );
-size_t cyoBase16DecodeGetLength( size_t size );
-size_t cyoBase16Decode( void* dest, const char* src, size_t size );
-
-/* Base32 Decoding */
-int    cyoBase32Validate( const char* src, size_t size );
-size_t cyoBase32DecodeGetLength( size_t size );
-size_t cyoBase32Decode( void* dest, const char* src, size_t size );
-
-/* Base64 Decoding */
-int    cyoBase64Validate( const char* src, size_t size );
-size_t cyoBase64DecodeGetLength( size_t size );
-size_t cyoBase64Decode( void* dest, const char* src, size_t size );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__CYODECODE_H*/
-
diff --git a/vendor/cyoencode-1.0.2/src/CyoEncode.c b/vendor/cyoencode-1.0.2/src/CyoEncode.c
deleted file mode 100644
index 3e9191f..0000000
--- a/vendor/cyoencode-1.0.2/src/CyoEncode.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * CyoEncode.c - part of the CyoEncode library
- *
- * Copyright (c) 2009-2012, Graham Bull.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  * Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "CyoEncode.h"
-
-#include <assert.h>
-
-/********************************** Shared ***********************************/
-
-static size_t cyoBaseXXEncodeGetLength( size_t size, size_t inputBytes, size_t outputBytes )
-{
-    return (((size + inputBytes - 1) / inputBytes) * outputBytes) + 1; /*plus terminator*/
-}
-
-/****************************** Base16 Encoding ******************************/
-
-static const size_t BASE16_INPUT = 1;
-static const size_t BASE16_OUTPUT = 2;
-static const char* const BASE16_TABLE = "0123456789ABCDEF";
-
-size_t cyoBase16EncodeGetLength( size_t size )
-{
-    return cyoBaseXXEncodeGetLength( size, BASE16_INPUT, BASE16_OUTPUT );
-}
-
-size_t cyoBase16Encode( char* dest, const void* src, size_t size )
-{
-    /*
-     * output 2 bytes for every 1 input:
-     *
-     *                 inputs: 1
-     * outputs: 1 = ----1111 = 1111----
-     *          2 = ----2222 = ----2222
-     */
-
-    if (dest && src)
-    {
-        unsigned char* pSrc = (unsigned char*)src;
-        size_t dwSrcSize = size;
-        size_t dwDestSize = 0;
-        unsigned char ch;
-
-        while (dwSrcSize >= 1)
-        {
-            /* 1 input */
-            ch = *pSrc++;
-            dwSrcSize -= BASE16_INPUT;
-
-            /* 2 outputs */
-            *dest++ = BASE16_TABLE[ (ch & 0xf0) >> 4 ];
-            *dest++ = BASE16_TABLE[ (ch & 0x0f)      ];
-            dwDestSize += BASE16_OUTPUT;
-        }
-        *dest++ = '\x0'; /*append terminator*/
-
-        return dwDestSize;
-    }
-    else
-        return 0; /*ERROR - null pointer*/
-}
-
-/****************************** Base32 Encoding ******************************/
-
-static const size_t BASE32_INPUT = 5;
-static const size_t BASE32_OUTPUT = 8;
-static const char* const BASE32_TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567=";
-
-size_t cyoBase32EncodeGetLength( size_t size )
-{
-    return cyoBaseXXEncodeGetLength( size, BASE32_INPUT, BASE32_OUTPUT );
-}
-
-size_t cyoBase32Encode( char* dest, const void* src, size_t size )
-{
-    /*
-     * output 8 bytes for every 5 input:
-     *
-     *                 inputs: 1        2        3        4        5
-     * outputs: 1 = ---11111 = 11111---
-     *          2 = ---222XX = -----222 XX------
-     *          3 = ---33333 =          --33333-
-     *          4 = ---4XXXX =          -------4 XXXX----
-     *          5 = ---5555X =                   ----5555 X-------
-     *          6 = ---66666 =                            -66666--
-     *          7 = ---77XXX =                            ------77 XXX-----
-     *          8 = ---88888 =                                     ---88888
-     */
-
-    if (dest && src)
-    {
-        unsigned char* pSrc = (unsigned char*)src;
-        size_t dwSrcSize = size;
-        size_t dwDestSize = 0;
-        size_t dwBlockSize;
-        unsigned char n1, n2, n3, n4, n5, n6, n7, n8;
-
-        while (dwSrcSize >= 1)
-        {
-            /* Encode inputs */
-            dwBlockSize = (dwSrcSize < BASE32_INPUT ? dwSrcSize : BASE32_INPUT);
-            n1 = n2 = n3 = n4 = n5 = n6 = n7 = n8 = 0;
-            switch (dwBlockSize)
-            {
-            case 5:
-                n8  =  (pSrc[ 4 ] & 0x1f);
-                n7  = ((pSrc[ 4 ] & 0xe0) >> 5);
-            case 4:
-                n7 |= ((pSrc[ 3 ] & 0x03) << 3);
-                n6  = ((pSrc[ 3 ] & 0x7c) >> 2);
-                n5  = ((pSrc[ 3 ] & 0x80) >> 7);
-            case 3:
-                n5 |= ((pSrc[ 2 ] & 0x0f) << 1);
-                n4  = ((pSrc[ 2 ] & 0xf0) >> 4);
-            case 2:
-                n4 |= ((pSrc[ 1 ] & 0x01) << 4);
-                n3  = ((pSrc[ 1 ] & 0x3e) >> 1);
-                n2  = ((pSrc[ 1 ] & 0xc0) >> 6);
-            case 1:
-                n2 |= ((pSrc[ 0 ] & 0x07) << 2);
-                n1  = ((pSrc[ 0 ] & 0xf8) >> 3);
-                break;
-
-            default:
-                assert( 0 );
-            }
-            pSrc += dwBlockSize;
-            dwSrcSize -= dwBlockSize;
-
-            /* Validate */
-            assert( n1 <= 31 );
-            assert( n2 <= 31 );
-            assert( n3 <= 31 );
-            assert( n4 <= 31 );
-            assert( n5 <= 31 );
-            assert( n6 <= 31 );
-            assert( n7 <= 31 );
-            assert( n8 <= 31 );
-
-            /* Padding */
-            switch (dwBlockSize)
-            {
-            case 1: n3 = n4 = 32;
-            case 2: n5 = 32;
-            case 3: n6 = n7 = 32;
-            case 4: n8 = 32;
-            case 5:
-                break;
-
-            default:
-                assert( 0 );
-            }
-
-            /* 8 outputs */
-            *dest++ = BASE32_TABLE[ n1 ];
-            *dest++ = BASE32_TABLE[ n2 ];
-            *dest++ = BASE32_TABLE[ n3 ];
-            *dest++ = BASE32_TABLE[ n4 ];
-            *dest++ = BASE32_TABLE[ n5 ];
-            *dest++ = BASE32_TABLE[ n6 ];
-            *dest++ = BASE32_TABLE[ n7 ];
-            *dest++ = BASE32_TABLE[ n8 ];
-            dwDestSize += BASE32_OUTPUT;
-        }
-        *dest++ = '\x0'; /*append terminator*/
-
-        return dwDestSize;
-    }
-    else
-        return 0; /*ERROR - null pointer*/
-}
-
-/****************************** Base64 Encoding ******************************/
-
-static const size_t BASE64_INPUT = 3;
-static const size_t BASE64_OUTPUT = 4;
-static const char* const BASE64_TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-
-size_t cyoBase64EncodeGetLength( size_t size )
-{
-    return cyoBaseXXEncodeGetLength( size, BASE64_INPUT, BASE64_OUTPUT );
-}
-
-size_t cyoBase64Encode( char* dest, const void* src, size_t size )
-{
-    /*
-     * output 4 bytes for every 3 input:
-     *
-     *                 inputs: 1        2        3
-     * outputs: 1 = --111111 = 111111--
-     *          2 = --22XXXX = ------22 XXXX----
-     *          3 = --3333XX =          ----3333 XX------
-     *          4 = --444444 =                   --444444
-     */
-
-    if (dest && src)
-    {
-        unsigned char* pSrc = (unsigned char*)src;
-        size_t dwSrcSize = size;
-        size_t dwDestSize = 0;
-        size_t dwBlockSize = 0;
-        unsigned char n1, n2, n3, n4;
-
-        while (dwSrcSize >= 1)
-        {
-            /* Encode inputs */
-            dwBlockSize = (dwSrcSize < BASE64_INPUT ? dwSrcSize : BASE64_INPUT);
-            n1 = n2 = n3 = n4 = 0;
-            switch (dwBlockSize)
-            {
-            case 3:
-                n4  =  (pSrc[ 2 ] & 0x3f);
-                n3  = ((pSrc[ 2 ] & 0xc0) >> 6);
-            case 2:
-                n3 |= ((pSrc[ 1 ] & 0x0f) << 2);
-                n2  = ((pSrc[ 1 ] & 0xf0) >> 4);
-            case 1:
-                n2 |= ((pSrc[ 0 ] & 0x03) << 4);
-                n1  = ((pSrc[ 0 ] & 0xfc) >> 2);
-                break;
-
-            default:
-                assert( 0 );
-            }
-            pSrc += dwBlockSize;
-            dwSrcSize -= dwBlockSize;
-
-            /* Validate */
-            assert( n1 <= 63 );
-            assert( n2 <= 63 );
-            assert( n3 <= 63 );
-            assert( n4 <= 63 );
-
-            /* Padding */
-            switch (dwBlockSize)
-            {
-            case 1: n3 = 64;
-            case 2: n4 = 64;
-            case 3:
-                break;
-
-            default:
-                assert( 0 );
-            }
-
-            /* 4 outputs */
-            *dest++ = BASE64_TABLE[ n1 ];
-            *dest++ = BASE64_TABLE[ n2 ];
-            *dest++ = BASE64_TABLE[ n3 ];
-            *dest++ = BASE64_TABLE[ n4 ];
-            dwDestSize += BASE64_OUTPUT;
-        }
-        *dest++ = '\x0'; /*append terminator*/
-
-        return dwDestSize;
-    }
-    else
-        return 0; /*ERROR - null pointer*/
-}
diff --git a/vendor/cyoencode-1.0.2/src/CyoEncode.h b/vendor/cyoencode-1.0.2/src/CyoEncode.h
deleted file mode 100644
index 183a66e..0000000
--- a/vendor/cyoencode-1.0.2/src/CyoEncode.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * CyoEncode.h - part of the CyoEncode library
- *
- * Copyright (c) 2009-2012, Graham Bull.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  * Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __CYOENCODE_H
-#define __CYOENCODE_H
-
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* Base16 Encoding */
-size_t cyoBase16EncodeGetLength( size_t size );
-size_t cyoBase16Encode( char* dest, const void* src, size_t size );
-
-/* Base32 Encoding */
-size_t cyoBase32EncodeGetLength( size_t size );
-size_t cyoBase32Encode( char* dest, const void* src, size_t size );
-
-/* Base64 Encoding */
-size_t cyoBase64EncodeGetLength( size_t size );
-size_t cyoBase64Encode( char* dest, const void* src, size_t size );
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /*__CYOENCODE_H*/
-
diff --git a/vendor/cyoencode-1.0.2/src/build.sh b/vendor/cyoencode-1.0.2/src/build.sh
deleted file mode 100755
index 67c0907..0000000
--- a/vendor/cyoencode-1.0.2/src/build.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-gcc test.c CyoEncode.c CyoDecode.c -o test
-
diff --git a/vendor/cyoencode-1.0.2/src/cyoencode-vc100.vcxproj b/vendor/cyoencode-1.0.2/src/cyoencode-vc100.vcxproj
deleted file mode 100644
index 8c3a8d2..0000000
--- a/vendor/cyoencode-1.0.2/src/cyoencode-vc100.vcxproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>cyoencode-vc100</ProjectName>
-    <ProjectGuid>{C773C1E9-CAC6-40AF-A400-567F73AB0178}</ProjectGuid>
-    <RootNamespace>cyoencodevc100</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="CyoDecode.c" />
-    <ClCompile Include="CyoEncode.c" />
-    <ClCompile Include="test.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="CyoDecode.h" />
-    <ClInclude Include="CyoEncode.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/vendor/cyoencode-1.0.2/src/cyoencode-vc71.vcproj b/vendor/cyoencode-1.0.2/src/cyoencode-vc71.vcproj
deleted file mode 100644
index 26c46ff..0000000
--- a/vendor/cyoencode-1.0.2/src/cyoencode-vc71.vcproj
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="7.10"
-	Name="cyoencode-vc71"
-	ProjectGUID="{E658BBCC-49D8-4B45-B374-EF43427EB66B}"
-	Keyword="Win32Proj">
-	<Platforms>
-		<Platform
-			Name="Win32"/>
-	</Platforms>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="Debug"
-			IntermediateDirectory="Debug"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="TRUE"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="5"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="4"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/cyoencode-vc71.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="TRUE"
-				ProgramDatabaseFile="$(OutDir)/cyoencode-vc71.pdb"
-				SubSystem="1"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="Release"
-			IntermediateDirectory="Release"
-			ConfigurationType="1"
-			CharacterSet="2">
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="4"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="TRUE"
-				DebugInformationFormat="3"/>
-			<Tool
-				Name="VCCustomBuildTool"/>
-			<Tool
-				Name="VCLinkerTool"
-				OutputFile="$(OutDir)/cyoencode-vc71.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="TRUE"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"/>
-			<Tool
-				Name="VCMIDLTool"/>
-			<Tool
-				Name="VCPostBuildEventTool"/>
-			<Tool
-				Name="VCPreBuildEventTool"/>
-			<Tool
-				Name="VCPreLinkEventTool"/>
-			<Tool
-				Name="VCResourceCompilerTool"/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"/>
-			<Tool
-				Name="VCWebDeploymentTool"/>
-			<Tool
-				Name="VCManagedWrapperGeneratorTool"/>
-			<Tool
-				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\CyoDecode.c">
-		</File>
-		<File
-			RelativePath=".\CyoDecode.h">
-		</File>
-		<File
-			RelativePath=".\CyoEncode.c">
-		</File>
-		<File
-			RelativePath=".\CyoEncode.h">
-		</File>
-		<File
-			RelativePath=".\test.c">
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vendor/cyoencode-1.0.2/src/cyoencode-vc80.vcproj b/vendor/cyoencode-1.0.2/src/cyoencode-vc80.vcproj
deleted file mode 100644
index c08685a..0000000
--- a/vendor/cyoencode-1.0.2/src/cyoencode-vc80.vcproj
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="cyoencode-vc80"
-	ProjectGUID="{F0A6E47E-F480-4F4A-8730-F655144E2D7F}"
-	RootNamespace="cyoencodevc80"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\CyoDecode.c"
-			>
-		</File>
-		<File
-			RelativePath=".\CyoDecode.h"
-			>
-		</File>
-		<File
-			RelativePath=".\CyoEncode.c"
-			>
-		</File>
-		<File
-			RelativePath=".\CyoEncode.h"
-			>
-		</File>
-		<File
-			RelativePath=".\test.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vendor/cyoencode-1.0.2/src/cyoencode-vc90.vcproj b/vendor/cyoencode-1.0.2/src/cyoencode-vc90.vcproj
deleted file mode 100644
index ee5927b..0000000
--- a/vendor/cyoencode-1.0.2/src/cyoencode-vc90.vcproj
+++ /dev/null
@@ -1,341 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="cyoencode-vc90"
-	ProjectGUID="{C773C1E9-CAC6-40AF-A400-567F73AB0178}"
-	RootNamespace="cyoencodevc90"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
-			IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				TargetEnvironment="3"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				EnableIntrinsicFunctions="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="17"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<File
-			RelativePath=".\CyoDecode.c"
-			>
-		</File>
-		<File
-			RelativePath=".\CyoDecode.h"
-			>
-		</File>
-		<File
-			RelativePath=".\CyoEncode.c"
-			>
-		</File>
-		<File
-			RelativePath=".\CyoEncode.h"
-			>
-		</File>
-		<File
-			RelativePath=".\test.c"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/vendor/cyoencode-1.0.2/src/test.c b/vendor/cyoencode-1.0.2/src/test.c
deleted file mode 100644
index 9274105..0000000
--- a/vendor/cyoencode-1.0.2/src/test.c
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * test.c - part of the CyoEncode library
- * 
- * Copyright (c) 2009-2012, Graham Bull.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- *  * Redistributions of source code must retain the above copyright notice, this
- *    list of conditions and the following disclaimer.
- *
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- 
-#include "CyoEncode.h"
-#include "CyoDecode.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-#define TEST_BASExx(base,str,expected) \
-    printf( "TEST_BASE%s('%s')='%s'", #base, str, expected ); \
-    required = cyoBase##base##EncodeGetLength( strlen( str )); \
-    encoded = (char*)malloc( required ); \
-    if (encoded == NULL) { \
-        printf( "\n*** ERROR: Unable to allocate buffer for encoding ***\n" ); \
-        goto exit; \
-    } \
-    cyoBase##base##Encode( encoded, str, strlen( str )); \
-    if (strcmp( encoded, expected ) != 0) { \
-        printf( "\n*** ERROR: Encoding failure ***\n" ); \
-        goto exit; \
-    } \
-    valid = cyoBase##base##Validate( encoded, strlen( encoded )); \
-    if (valid < 0) \
-    { \
-        printf( "\n*** ERROR: Unable to validate encoding (error %d) ***\n", valid ); \
-        goto exit; \
-    } \
-    printf( " [passed]\n" ); \
-    free( encoded ); encoded = NULL;
-
-#define TEST_BASE64(str,expected) TEST_BASExx(64,str,expected)
-#define TEST_BASE32(str,expected) TEST_BASExx(32,str,expected)
-#define TEST_BASE16(str,expected) TEST_BASExx(16,str,expected)
-
-#define CHECK_INVALID_BASExx(base,str,res) \
-    printf( "CHECK_INVALID_BASE%s('%s')=%d", #base, str, res ); \
-    valid = cyoBase##base##Validate( str, strlen( str )); \
-    if (valid == 0) \
-    { \
-        printf( "\n*** ERROR: This is a valid encoding! ***\n" ); \
-        goto exit; \
-    } \
-    if (valid != res) \
-    { \
-        printf( "\n*** ERROR: Expected a different return code! (%d) ***\n", valid ); \
-        goto exit; \
-    } \
-    printf( " [passed]\n", #base, str ); \
-
-#define CHECK_INVALID_BASE16(enc,res) CHECK_INVALID_BASExx(16,enc,res)
-#define CHECK_INVALID_BASE32(enc,res) CHECK_INVALID_BASExx(32,enc,res)
-#define CHECK_INVALID_BASE64(enc,res) CHECK_INVALID_BASExx(64,enc,res)
-
-int main( void )
-{
-    const char* const original = "A wise man speaks when he has something to say";
-    size_t required = 0;
-    char* encoded = NULL;
-    char* decoded = NULL;
-    int valid = 0;
-    int retcode = 1;
-
-    printf( "Running CyoEncode tests...\n" );
-
-    /* Encode using Base64 */
-
-    printf( "Original = '%s'\n", original );
-    required = cyoBase64EncodeGetLength( strlen( original ));
-    encoded = (char*)malloc( required );
-    if (encoded == NULL)
-    {
-        printf( "*** ERROR: Unable to allocate buffer for encoding ***\n" );
-        goto exit;
-    }
-    cyoBase64Encode( encoded, original, strlen( original ));
-    printf( "Encoded = '%s'\n", encoded );
-    
-    /* Validate encoding */
-    
-    valid = cyoBase64Validate( encoded, strlen( encoded ));
-    if (valid < 0)
-    {
-        printf( "*** ERROR: Encoding failure (error %d) ***\n", valid );
-        goto exit;
-    }
-
-    /* Decode using Base64 */
-
-    required = cyoBase64DecodeGetLength( strlen( encoded ));
-    decoded = (char*)malloc( required );
-    if (decoded == NULL)
-    {
-        printf( "*** ERROR: Unable to allocate buffer for decoding ***\n" );
-        goto exit;
-    }
-    cyoBase64Decode( decoded, encoded, strlen( encoded ));
-    printf( "Decoded = '%s'\n", decoded );
-
-    /* Validate */
-
-    if (strcmp( original, decoded ) != 0)
-    {
-        printf( "*** ERROR: Encoding/decoding failure ***\n" );
-        goto exit;
-    }
-
-    free( encoded );
-    encoded = NULL;
-    free( decoded );
-    decoded = NULL;
-
-    /* Test vectors from RFC 4648 */
-
-    TEST_BASE16( "", "" );
-    TEST_BASE16( "f", "66" );
-    TEST_BASE16( "fo", "666F" );
-    TEST_BASE16( "foo", "666F6F" );
-    TEST_BASE16( "foob", "666F6F62" );
-    TEST_BASE16( "fooba", "666F6F6261" );
-    TEST_BASE16( "foobar", "666F6F626172" );
-    
-    TEST_BASE32( "", "" );
-    TEST_BASE32( "f", "MY======" );
-    TEST_BASE32( "fo", "MZXQ====" );
-    TEST_BASE32( "foo", "MZXW6===" );
-    TEST_BASE32( "foob", "MZXW6YQ=" );
-    TEST_BASE32( "fooba", "MZXW6YTB" );
-    TEST_BASE32( "foobar", "MZXW6YTBOI======" );
-
-    TEST_BASE64( "", "" );
-    TEST_BASE64( "f", "Zg==" );
-    TEST_BASE64( "fo", "Zm8=" );
-    TEST_BASE64( "foo", "Zm9v" );
-    TEST_BASE64( "foob", "Zm9vYg==" );
-    TEST_BASE64( "fooba", "Zm9vYmE=" );
-    TEST_BASE64( "foobar", "Zm9vYmFy" );
-
-    /* Other tests */
-
-    CHECK_INVALID_BASE16( "1", -1 );
-    CHECK_INVALID_BASE16( "123", -1 );
-    CHECK_INVALID_BASE16( "1G", -2 );
-
-    CHECK_INVALID_BASE32( "A", -1 );
-    CHECK_INVALID_BASE32( "ABCDEFG", -1 );
-    CHECK_INVALID_BASE32( "ABCDEFG1", -2 );
-    CHECK_INVALID_BASE32( "A=======", -2 );
-
-    CHECK_INVALID_BASE64( "A", -1 );
-    CHECK_INVALID_BASE64( "ABCDE", -1 );
-    CHECK_INVALID_BASE64( "A&B=", -2 );
-    CHECK_INVALID_BASE64( "A===", -2 );
-
-    printf( "*** All tests passed ***\n" );
-    retcode = 0;
-
-exit:
-    if (encoded != NULL)
-        free( encoded );
-    if (decoded != NULL)
-        free( decoded );
-
-    return retcode;
-}

From ff099209b6510412e45ac83fd67f5b8e9a2ec1ea Mon Sep 17 00:00:00 2001
From: Roman Olearski <rolearski@syncad.com>
Date: Thu, 13 Jul 2017 16:18:29 +0200
Subject: [PATCH 102/108] added ntp hash_ctr_rng

---
 CMakeLists.txt                     |   1 +
 include/fc/crypto/hash_ctr_rng.hpp | 107 ++++++++++++
 include/fc/network/ntp.hpp         |  27 +++
 src/network/ntp.cpp                | 272 +++++++++++++++++++++++++++++
 4 files changed, 407 insertions(+)
 create mode 100644 include/fc/crypto/hash_ctr_rng.hpp
 create mode 100644 include/fc/network/ntp.hpp
 create mode 100644 src/network/ntp.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca390f5..dafcdb0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,6 +236,7 @@ set( fc_sources
      src/network/http/http_server.cpp
      src/network/http/websocket.cpp
      src/network/ip.cpp
+     src/network/ntp.cpp
      src/network/rate_limiting.cpp
      src/network/resolve.cpp
      src/network/url.cpp
diff --git a/include/fc/crypto/hash_ctr_rng.hpp b/include/fc/crypto/hash_ctr_rng.hpp
new file mode 100644
index 0000000..878cf77
--- /dev/null
+++ b/include/fc/crypto/hash_ctr_rng.hpp
@@ -0,0 +1,107 @@
+#pragma once
+
+#include <boost/multiprecision/integer.hpp>
+
+namespace fc {
+
+/**
+ * Always returns 0.  Useful for testing.
+ */
+class nullary_rng
+{
+   public:
+      nullary_rng() {}
+      virtual ~nullary_rng() {}
+
+      template< typename T > T operator()( T max )
+      {   return T(0);   }
+} ;
+
+/**
+ * The hash_ctr_rng generates bits using a hash function in counter (CTR)
+ * mode.
+ */
+template<class HashClass, int SeedLength>
+class hash_ctr_rng
+{
+   public:
+      hash_ctr_rng( const char* seed, uint64_t counter = 0 )
+         : _counter( counter ), _current_offset( 0 )
+      {
+         memcpy( _seed, seed, SeedLength );
+         _reset_current_value();
+         return;
+      }
+
+      virtual ~hash_ctr_rng() {}
+
+      uint64_t get_bits( uint8_t count )
+      {
+         uint64_t result = 0;
+         uint64_t mask = 1;
+         // grab the requested number of bits
+         while( count > 0 )
+         {
+            result |=
+               (
+                  (
+                     (
+                        _current_value.data()[ (_current_offset >> 3) & 0x1F ]
+                        & ( 1 << (_current_offset & 0x07) )
+                     )
+                     != 0
+                  ) ? mask : 0
+               );
+            mask += mask;
+            --count;
+            ++_current_offset;
+            if( _current_offset == (_current_value.data_size() << 3) )
+            {
+               _counter++;
+               _current_offset = 0;
+               _reset_current_value();
+            }
+         }
+         return result;
+      }
+
+      uint64_t operator()( uint64_t bound )
+      {
+         if( bound <= 1 )
+            return 0;
+         uint8_t bitcount = boost::multiprecision::detail::find_msb( bound ) + 1;
+
+         // probability of loop exiting is >= 1/2, so probability of
+         // running N times is bounded above by (1/2)^N
+         while( true )
+         {
+            uint64_t result = get_bits( bitcount );
+            if( result < bound )
+               return result;
+         }
+      }
+
+      // convenience method which does casting for types other than uint64_t
+      template< typename T > T operator()( T bound )
+      {  return (T) ( (*this)(uint64_t( bound )) );   }
+
+      void _reset_current_value()
+      {
+         // internal implementation detail, called to update
+         //   _current_value when _counter changes
+         typename HashClass::encoder enc;
+         enc.write(           _seed   , SeedLength );
+         enc.write( (char *) &_counter,          8 );
+         _current_value = enc.result();
+         return;
+      }
+
+      uint64_t _counter;
+      char _seed[ SeedLength ];
+      HashClass _current_value;
+      uint16_t _current_offset;
+
+      static const int seed_length = SeedLength;
+};
+
+} // end namespace fc
diff --git a/include/fc/network/ntp.hpp b/include/fc/network/ntp.hpp
new file mode 100644
index 0000000..6067b3c
--- /dev/null
+++ b/include/fc/network/ntp.hpp
@@ -0,0 +1,27 @@
+#pragma once
+#include <string>
+#include <memory>
+#include <fc/time.hpp>
+#include <fc/optional.hpp>
+
+
+namespace fc {
+
+   namespace detail { class ntp_impl; }
+
+   class ntp 
+   {
+      public:
+         ntp();
+         ~ntp();
+
+         void add_server( const std::string& hostname, uint16_t port = 123 );
+         void set_request_interval( uint32_t interval_sec );
+         void request_now();
+         optional<time_point> get_time()const;
+
+      private:
+        std::unique_ptr<detail::ntp_impl> my;
+   };
+
+} // namespace fc
diff --git a/src/network/ntp.cpp b/src/network/ntp.cpp
new file mode 100644
index 0000000..5c0a085
--- /dev/null
+++ b/src/network/ntp.cpp
@@ -0,0 +1,272 @@
+#include <fc/network/ntp.hpp>
+#include <fc/network/udp_socket.hpp>
+#include <fc/network/resolve.hpp>
+#include <fc/network/ip.hpp>
+#include <fc/thread/thread.hpp>
+
+#include <stdint.h>
+#include "../byteswap.hpp"
+
+#include <atomic>
+#include <array>
+
+namespace fc
+{
+  namespace detail {
+
+  class ntp_impl 
+  {
+    public:
+      /** vector < host, port >  */
+      fc::thread                                       _ntp_thread;
+      std::vector< std::pair< std::string, uint16_t> > _ntp_hosts;
+      fc::future<void>                                 _read_loop_done;
+      udp_socket                                       _sock;
+      uint32_t                                         _request_interval_sec;
+      uint32_t                                         _retry_failed_request_interval_sec;
+      fc::time_point                                   _last_valid_ntp_reply_received_time;
+
+      std::atomic_bool                                 _last_ntp_delta_initialized;
+      std::atomic<int64_t>                             _last_ntp_delta_microseconds;
+
+
+      fc::future<void>                                 _request_time_task_done;
+
+      ntp_impl() :
+      _ntp_thread("ntp"),
+      _request_interval_sec( 60*60 /* 1 hr */),
+      _retry_failed_request_interval_sec(60 * 5),
+      _last_ntp_delta_microseconds(0)
+      { 
+        _last_ntp_delta_initialized = false;
+        _ntp_hosts.push_back( std::make_pair( "pool.ntp.org",123 ) );
+      } 
+
+      ~ntp_impl() 
+      { 
+      }
+
+      fc::time_point ntp_timestamp_to_fc_time_point(uint64_t ntp_timestamp_net_order)
+      {
+        uint64_t ntp_timestamp_host = bswap_64(ntp_timestamp_net_order);
+        uint32_t fractional_seconds = ntp_timestamp_host & 0xffffffff;
+        uint32_t microseconds = (uint32_t)((((uint64_t)fractional_seconds * 1000000) + (uint64_t(1) << 31)) >> 32);
+        uint32_t seconds_since_1900 = ntp_timestamp_host >> 32;
+        uint32_t seconds_since_epoch = seconds_since_1900 - 2208988800;
+        return fc::time_point() + fc::seconds(seconds_since_epoch) + fc::microseconds(microseconds);
+      }
+
+      uint64_t fc_time_point_to_ntp_timestamp(const fc::time_point& fc_timestamp)
+      {
+        uint64_t microseconds_since_epoch = (uint64_t)fc_timestamp.time_since_epoch().count();
+        uint32_t seconds_since_epoch = (uint32_t)(microseconds_since_epoch / 1000000);
+        uint32_t seconds_since_1900 = seconds_since_epoch + 2208988800;
+        uint32_t microseconds = microseconds_since_epoch % 1000000;
+        uint32_t fractional_seconds = (uint32_t)((((uint64_t)microseconds << 32) + (uint64_t(1) << 31)) / 1000000);
+        uint64_t ntp_timestamp_net_order = ((uint64_t)seconds_since_1900 << 32) + fractional_seconds;
+        return bswap_64(ntp_timestamp_net_order);
+      }
+
+      void request_now()
+      {
+        assert(_ntp_thread.is_current());
+        for( auto item : _ntp_hosts )
+        {
+          try 
+          {
+            //wlog( "resolving... ${r}", ("r", item) );
+            auto eps = resolve( item.first, item.second );
+            for( auto ep : eps )
+            {
+             // wlog( "sending request to ${ep}", ("ep",ep) );
+              std::shared_ptr<char> send_buffer(new char[48], [](char* p){ delete[] p; });
+              std::array<unsigned char, 48> packet_to_send { {010,0,0,0,0,0,0,0,0} };
+              memcpy(send_buffer.get(), packet_to_send.data(), packet_to_send.size());
+              uint64_t* send_buf_as_64_array = (uint64_t*)send_buffer.get();
+              send_buf_as_64_array[5] = fc_time_point_to_ntp_timestamp(fc::time_point::now()); // 5 = Transmit Timestamp
+              _sock.send_to(send_buffer, packet_to_send.size(), ep);
+              break;
+            }
+          } 
+          catch (const fc::canceled_exception&)
+          {
+            throw;
+          }
+          // this could fail to resolve but we want to go on to other hosts..
+          catch ( const fc::exception& e )
+          {
+            elog( "${e}", ("e",e.to_detail_string() ) ); 
+          }
+        }
+      } // request_now
+
+      // started for first time in ntp() constructor, canceled in ~ntp() destructor
+      // this task gets invoked every _retry_failed_request_interval_sec (currently 5 min), and if
+      // _request_interval_sec (currently 1 hour) has passed since the last successful update, 
+      // it sends a new request
+      void request_time_task()
+      {
+        assert(_ntp_thread.is_current());
+        if (_last_valid_ntp_reply_received_time <= fc::time_point::now() - fc::seconds(_request_interval_sec - 5))
+          request_now();
+        if (!_request_time_task_done.valid() || !_request_time_task_done.canceled())
+          _request_time_task_done = schedule( [=](){ request_time_task(); }, 
+                                              fc::time_point::now() + fc::seconds(_retry_failed_request_interval_sec), 
+                                              "request_time_task" );
+      } // request_loop
+
+      void start_read_loop()
+      {
+        _read_loop_done = _ntp_thread.async( [this](){ read_loop(); }, "ntp_read_loop" );
+      }
+
+      void read_loop()
+      {
+        assert(_ntp_thread.is_current());
+
+        uint32_t receive_buffer_size = sizeof(uint64_t) * 1024;
+        std::shared_ptr<char> receive_buffer(new char[receive_buffer_size], [](char* p){ delete[] p; });
+        uint64_t* recv_buf = (uint64_t*)receive_buffer.get();
+
+        //outer while to restart read-loop if exception is thrown while waiting to receive on socket.
+        while( !_read_loop_done.canceled() )
+        {
+          // if you start the read while loop here, the recieve_from call will throw "invalid argument" on win32,
+          // so instead we start the loop after making our first request
+          try 
+          {
+            _sock.open();
+            request_time_task(); //this will re-send a time request
+
+            while( !_read_loop_done.canceled() )
+            {
+              fc::ip::endpoint from;
+              try
+              {
+                _sock.receive_from( receive_buffer, receive_buffer_size, from );
+              //  wlog("received ntp reply from ${from}",("from",from) );
+              } FC_RETHROW_EXCEPTIONS(error, "Error reading from NTP socket");
+
+              fc::time_point receive_time = fc::time_point::now();
+              fc::time_point origin_time = ntp_timestamp_to_fc_time_point(recv_buf[3]);
+              fc::time_point server_receive_time = ntp_timestamp_to_fc_time_point(recv_buf[4]);
+              fc::time_point server_transmit_time = ntp_timestamp_to_fc_time_point(recv_buf[5]);
+
+              fc::microseconds offset(((server_receive_time - origin_time) +
+                                       (server_transmit_time - receive_time)).count() / 2);
+              fc::microseconds round_trip_delay((receive_time - origin_time) -
+                                                (server_transmit_time - server_receive_time));
+              //wlog("origin_time = ${origin_time}, server_receive_time = ${server_receive_time}, server_transmit_time = ${server_transmit_time}, receive_time = ${receive_time}",
+              //     ("origin_time", origin_time)("server_receive_time", server_receive_time)("server_transmit_time", server_transmit_time)("receive_time", receive_time));
+              // wlog("ntp offset: ${offset}, round_trip_delay ${delay}", ("offset", offset)("delay", round_trip_delay));
+
+              //if the reply we just received has occurred more than a second after our last time request (it was more than a second ago since our last request)
+              if( round_trip_delay > fc::microseconds(300000) )
+              {
+                wlog("received stale ntp reply requested at ${request_time}, send a new time request", ("request_time", origin_time));
+                request_now(); //request another reply and ignore this one
+              }
+              else //we think we have a timely reply, process it
+              {
+                if( offset < fc::seconds(60*60*24) && offset > fc::seconds(-60*60*24) )
+                {
+                  _last_ntp_delta_microseconds = offset.count();
+                  _last_ntp_delta_initialized = true;
+                  fc::microseconds ntp_delta_time = fc::microseconds(_last_ntp_delta_microseconds);
+                  _last_valid_ntp_reply_received_time = receive_time;
+                  wlog("ntp_delta_time updated to ${delta_time} us", ("delta_time",ntp_delta_time) );
+                }
+                else
+                  elog( "NTP time and local time vary by more than a day! ntp:${ntp_time} local:${local}", 
+                       ("ntp_time", receive_time + offset)("local", fc::time_point::now()) );
+              }
+            }
+          } // try
+          catch (fc::canceled_exception)
+          {
+            throw;
+          }
+          catch (const fc::exception& e)
+          {
+            //swallow any other exception and restart loop
+            elog("exception in read_loop, going to restart it. ${e}",("e",e));
+          }
+          catch (...)
+          {
+            //swallow any other exception and restart loop
+            elog("unknown exception in read_loop, going to restart it.");
+          }
+          _sock.close();
+          fc::usleep(fc::seconds(_retry_failed_request_interval_sec));
+        } //outer while loop
+        wlog("exiting ntp read_loop");
+      } //end read_loop()
+    }; //ntp_impl
+
+  } // namespace detail
+
+
+
+  ntp::ntp()
+  :my( new detail::ntp_impl() )
+  {
+    my->start_read_loop();
+  }
+
+  ntp::~ntp()
+  {
+    my->_ntp_thread.async([=](){
+      try
+      {
+        my->_request_time_task_done.cancel_and_wait("ntp object is destructing");
+      }
+      catch ( const fc::exception& e )
+      {
+        wlog( "Exception thrown while shutting down NTP's request_time_task, ignoring: ${e}", ("e",e) );
+      }
+      catch (...)
+      {
+        wlog( "Exception thrown while shutting down NTP's request_time_task, ignoring" );
+      }
+      
+      try 
+      {
+        my->_read_loop_done.cancel_and_wait("ntp object is destructing");
+      } 
+      catch ( const fc::exception& e )
+      {
+        wlog( "Exception thrown while shutting down NTP's read_loop, ignoring: ${e}", ("e",e) );
+      }
+      catch (...)
+      {
+        wlog( "Exception thrown while shutting down NTP's read_loop, ignoring" );
+      }
+
+    }, "ntp_shutdown_task").wait();
+  }
+
+
+  void ntp::add_server( const std::string& hostname, uint16_t port)
+  {
+    my->_ntp_thread.async( [=](){ my->_ntp_hosts.push_back( std::make_pair(hostname,port) ); }, "add_server" ).wait();
+  }
+
+  void ntp::set_request_interval( uint32_t interval_sec )
+  {
+    my->_request_interval_sec = interval_sec;
+    my->_retry_failed_request_interval_sec = std::min(my->_retry_failed_request_interval_sec, interval_sec);
+  }
+
+  void ntp::request_now()
+  {
+    my->_ntp_thread.async( [=](){ my->request_now(); }, "request_now" ).wait();
+  }
+
+  optional<time_point> ntp::get_time()const
+  {
+    if( my->_last_ntp_delta_initialized )
+      return fc::time_point::now() + fc::microseconds(my->_last_ntp_delta_microseconds);
+    return optional<time_point>();
+  }
+
+} //namespace fc

From b1bba0a5d7a3d06a8e5b35ae2a17812919cbe0b3 Mon Sep 17 00:00:00 2001
From: Eric Frias <efrias@syncad.com>
Date: Sun, 29 Apr 2018 18:58:22 -0400
Subject: [PATCH 103/108] add missing implementation for
 logger::remove_appender()

---
 src/log/logger.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/log/logger.cpp b/src/log/logger.cpp
index 8c4f149..4bce5c4 100644
--- a/src/log/logger.cpp
+++ b/src/log/logger.cpp
@@ -99,8 +99,8 @@ namespace fc {
     void logger::add_appender( const fc::shared_ptr<appender>& a )
     { my->_appenders.push_back(a); }
     
-//    void logger::remove_appender( const fc::shared_ptr<appender>& a )
- //   { my->_appenders.erase(a); }
+    void logger::remove_appender( const fc::shared_ptr<appender>& a ) 
+    { my->_appenders.erase(std::remove(my->_appenders.begin(), my->_appenders.end(), a), my->_appenders.end()); } 
 
     std::vector<fc::shared_ptr<appender> > logger::get_appenders()const
     {

From 69a1ceabce1778ee49004eeb6f821d31e4383be2 Mon Sep 17 00:00:00 2001
From: Eric Frias <efrias@syncad.com>
Date: Wed, 9 May 2018 15:39:57 -0400
Subject: [PATCH 104/108] Add a fc_[diwe]dump() function, analogous to
 fc_[diew]log()

---
 include/fc/log/logger.hpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/include/fc/log/logger.hpp b/include/fc/log/logger.hpp
index 8c1020d..a0e85b3 100644
--- a/include/fc/log/logger.hpp
+++ b/include/fc/log/logger.hpp
@@ -155,6 +155,15 @@ namespace fc
 #define FC_FORMAT_ARG_PARAMS( ... )\
     BOOST_PP_SEQ_FOR_EACH( FC_FORMAT_ARGS, v, __VA_ARGS__ ) 
 
+#define fc_ddump( LOGGER, SEQ ) \
+    fc_dlog( LOGGER, FC_FORMAT(SEQ), FC_FORMAT_ARG_PARAMS(SEQ) )  
+#define fc_idump( LOGGER, SEQ ) \
+    fc_ilog( LOGGER, FC_FORMAT(SEQ), FC_FORMAT_ARG_PARAMS(SEQ) )  
+#define fc_wdump( LOGGER, SEQ ) \
+    fc_wlog( LOGGER, FC_FORMAT(SEQ), FC_FORMAT_ARG_PARAMS(SEQ) )  
+#define fc_edump( LOGGER, SEQ ) \
+    fc_elog( LOGGER, FC_FORMAT(SEQ), FC_FORMAT_ARG_PARAMS(SEQ) )  
+
 #define ddump( SEQ ) \
     dlog( FC_FORMAT(SEQ), FC_FORMAT_ARG_PARAMS(SEQ) )  
 #define idump( SEQ ) \

From 00efb88ac7579996529516a3ba1aa86d3a7b36e7 Mon Sep 17 00:00:00 2001
From: pbattu <p.battu@pbsa.info>
Date: Tue, 21 May 2019 18:42:14 -0300
Subject: [PATCH 105/108] fc changes to support ubuntu-18.04 upgrade

---
 .gitignore                                    |   0
 .gitmodules                                   |   0
 CMakeLists.txt                                |  15 +-
 CMakeModules/ArgumentParser.cmake             |   0
 CMakeModules/FindBoost.cmake                  |   0
 CMakeModules/FindReadline.cmake               |   2 -
 CMakeModules/FindVLD.cmake                    |   0
 CMakeModules/ParseLibraryList.cmake           |   0
 CMakeModules/SetupTargetMacros.cmake          |   0
 CMakeModules/UseLibraryMacros.cmake           |   0
 CMakeModules/VersionMacros.cmake              |   0
 GitVersionGen/GetGitRevisionDescription.cmake |   0
 .../GetGitRevisionDescription.cmake.in        |   0
 README-ecc.md                                 |   0
 README.md                                     |   0
 fc.natvis                                     |   0
 include/fc/actor.hpp                          |   0
 include/fc/aligned.hpp                        |   0
 include/fc/any.hpp                            |   0
 include/fc/api.hpp                            |   0
 include/fc/array.hpp                          |   0
 include/fc/asio.hpp                           |   0
 include/fc/bitutil.hpp                        |   0
 include/fc/bloom_filter.hpp                   |   0
 include/fc/compress/smaz.hpp                  |   0
 include/fc/compress/zlib.hpp                  |   0
 include/fc/container/deque.hpp                |   0
 include/fc/container/deque_fwd.hpp            |   0
 include/fc/container/flat.hpp                 |   0
 include/fc/container/flat_fwd.hpp             |   0
 include/fc/crypto/aes.hpp                     |   0
 include/fc/crypto/base36.hpp                  |   0
 include/fc/crypto/base58.hpp                  |   0
 include/fc/crypto/base64.hpp                  |   0
 include/fc/crypto/bigint.hpp                  |   0
 include/fc/crypto/blowfish.hpp                |   0
 include/fc/crypto/city.hpp                    |   0
 include/fc/crypto/dh.hpp                      |   0
 include/fc/crypto/digest.hpp                  |   0
 include/fc/crypto/elliptic.hpp                |  26 +-
 include/fc/crypto/hash_ctr_rng.hpp            |   0
 include/fc/crypto/hex.hpp                     |   0
 include/fc/crypto/hmac.hpp                    |   0
 include/fc/crypto/md5.hpp                     |   0
 include/fc/crypto/openssl.hpp                 |   0
 include/fc/crypto/pke.hpp                     |   0
 include/fc/crypto/rand.hpp                    |   0
 include/fc/crypto/ripemd160.hpp               |   0
 include/fc/crypto/sha1.hpp                    |   0
 include/fc/crypto/sha224.hpp                  |   0
 include/fc/crypto/sha256.hpp                  |  12 +-
 include/fc/crypto/sha512.hpp                  |   0
 include/fc/exception/exception.hpp            |   0
 include/fc/filesystem.hpp                     |   0
 include/fc/fixed_string.hpp                   |   0
 include/fc/fwd.hpp                            |   0
 include/fc/fwd_impl.hpp                       |   0
 include/fc/git_revision.hpp                   |   0
 include/fc/interprocess/container.hpp         |   0
 include/fc/interprocess/file_mapping.hpp      |   0
 include/fc/interprocess/file_mutex.hpp        |   0
 include/fc/interprocess/iprocess.hpp          |   0
 include/fc/interprocess/mmap_struct.hpp       |   0
 include/fc/interprocess/process.hpp           |   0
 include/fc/interprocess/signals.hpp           |   0
 include/fc/io/buffered_iostream.hpp           |   0
 include/fc/io/console.hpp                     |   0
 include/fc/io/datastream.hpp                  |   0
 include/fc/io/datastream_back.hpp             |   0
 include/fc/io/enum_type.hpp                   |   0
 include/fc/io/fstream.hpp                     |   0
 include/fc/io/iobuffer.hpp                    |   0
 include/fc/io/iostream.hpp                    |   0
 include/fc/io/json.hpp                        |   0
 include/fc/io/json_relaxed.hpp                |   0
 include/fc/io/raw.hpp                         |   0
 include/fc/io/raw_fwd.hpp                     |   0
 include/fc/io/raw_unpack_file.hpp             |   0
 include/fc/io/raw_variant.hpp                 |   0
 include/fc/io/sstream.hpp                     |   0
 include/fc/io/stdio.hpp                       |   0
 include/fc/io/varint.hpp                      |   0
 include/fc/log/appender.hpp                   |   0
 include/fc/log/console_appender.hpp           |   0
 include/fc/log/file_appender.hpp              |   0
 include/fc/log/gelf_appender.hpp              |   0
 include/fc/log/log_message.hpp                |   0
 include/fc/log/logger.hpp                     |   0
 include/fc/log/logger_config.hpp              |   0
 include/fc/make_fused.hpp                     |   0
 include/fc/network/http/connection.hpp        |   0
 include/fc/network/http/server.hpp            |   0
 include/fc/network/http/websocket.hpp         |   0
 include/fc/network/ip.hpp                     |   0
 include/fc/network/ntp.hpp                    |   0
 include/fc/network/rate_limiting.hpp          |   0
 include/fc/network/resolve.hpp                |   0
 include/fc/network/tcp_socket.hpp             |   0
 include/fc/network/tcp_socket_io_hooks.hpp    |   0
 include/fc/network/udp_socket.hpp             |   0
 include/fc/network/url.hpp                    |   0
 include/fc/noncopyable.hpp                    |   0
 include/fc/optional.hpp                       |   0
 include/fc/platform_independence.hpp          |   0
 include/fc/real128.hpp                        |   0
 include/fc/reflect/reflect.hpp                |   0
 include/fc/reflect/typename.hpp               |   2 +-
 include/fc/reflect/variant.hpp                |   0
 include/fc/rpc/api_connection.hpp             |   0
 include/fc/rpc/binary_api_connection.hpp      |   0
 include/fc/rpc/bstate.hpp                     |   0
 include/fc/rpc/cli.hpp                        |   0
 include/fc/rpc/http_api.hpp                   |   0
 include/fc/rpc/json_connection.hpp            |   0
 include/fc/rpc/state.hpp                      |   0
 include/fc/rpc/variant_connection.hpp         |   0
 include/fc/rpc/variant_stream.hpp             |   0
 include/fc/rpc/websocket_api.hpp              |   0
 include/fc/safe.hpp                           |   0
 include/fc/scoped_exit.hpp                    |   0
 include/fc/shared_ptr.hpp                     |   0
 include/fc/signal.hpp                         |   0
 include/fc/signals.hpp                        |   0
 include/fc/smart_ref_fwd.hpp                  |   0
 include/fc/smart_ref_impl.hpp                 |   0
 include/fc/static_variant.hpp                 |   2 +-
 include/fc/string.hpp                         |   0
 include/fc/thread/future.hpp                  |   0
 include/fc/thread/mutex.hpp                   |   0
 .../fc/thread/non_preemptable_scope_check.hpp |   0
 include/fc/thread/priority.hpp                |   0
 include/fc/thread/scoped_lock.hpp             |   0
 include/fc/thread/spin_lock.hpp               |   0
 include/fc/thread/spin_yield_lock.hpp         |   0
 include/fc/thread/task.hpp                    |   0
 include/fc/thread/thread.hpp                  |   0
 include/fc/thread/thread_specific.hpp         |   0
 include/fc/thread/unique_lock.hpp             |   0
 include/fc/thread/wait_condition.hpp          |   0
 include/fc/time.hpp                           |   0
 include/fc/tuple.hpp                          |   0
 include/fc/uint128.hpp                        |   0
 include/fc/unique_ptr.hpp                     |   0
 include/fc/utf8.hpp                           |   0
 include/fc/utility.hpp                        |   0
 include/fc/variant.hpp                        |   0
 include/fc/variant_object.hpp                 |   0
 include/fc/vector.hpp                         |   0
 include/fc/vector_fwd.hpp                     |   0
 include/fc/wait_any.hpp                       |   0
 src/asio.cpp                                  |   0
 src/byteswap.hpp                              |   0
 src/compress/miniz.c                          |   0
 src/compress/smaz.cpp                         |   0
 src/compress/zlib.cpp                         |   0
 src/crypto/_digest_common.cpp                 |   0
 src/crypto/_digest_common.hpp                 |   0
 src/crypto/_elliptic_impl_priv.hpp            |   0
 src/crypto/_elliptic_impl_pub.hpp             |   0
 src/crypto/aes.cpp                            |   0
 src/crypto/base36.cpp                         |   0
 src/crypto/base58.cpp                         | 143 +++---
 src/crypto/base64.cpp                         |   0
 src/crypto/bigint.cpp                         |   0
 src/crypto/blowfish.cpp                       |   0
 src/crypto/city.cpp                           |   0
 src/crypto/crc.cpp                            |   0
 src/crypto/dh.cpp                             |  44 +-
 src/crypto/elliptic_common.cpp                |  13 +-
 src/crypto/elliptic_impl_priv.cpp             |   0
 src/crypto/elliptic_impl_pub.cpp              |   0
 src/crypto/elliptic_mixed.cpp                 |   0
 src/crypto/elliptic_openssl.cpp               |   0
 src/crypto/elliptic_secp256k1.cpp             | 254 ----------
 src/crypto/hex.cpp                            |   0
 src/crypto/md5.cpp                            |   0
 src/crypto/openssl.cpp                        |   0
 src/crypto/pke.cpp                            |   0
 src/crypto/rand.cpp                           |   0
 src/crypto/ripemd160.cpp                      |   0
 src/crypto/sha1.cpp                           |   0
 src/crypto/sha224.cpp                         |   0
 src/crypto/sha256.cpp                         |   0
 src/crypto/sha512.cpp                         |   0
 src/exception.cpp                             |   0
 src/filesystem.cpp                            |  27 +-
 src/git_revision.cpp.in                       |   0
 src/interprocess/file_mapping.cpp             |   0
 src/interprocess/file_mutex.cpp               |   0
 src/interprocess/mmap_struct.cpp              |   0
 src/interprocess/process.cpp                  |   0
 src/interprocess/signals.cpp                  |   0
 src/io/buffered_iostream.cpp                  |   0
 src/io/console.cpp                            |   0
 src/io/datastream.cpp                         |   0
 src/io/fstream.cpp                            |   0
 src/io/iostream.cpp                           |   0
 src/io/json.cpp                               |   0
 src/io/sstream.cpp                            |   0
 src/io/varint.cpp                             |   0
 src/log/appender.cpp                          |   0
 src/log/console_appender.cpp                  |   0
 src/log/console_defines.h                     |   0
 src/log/file_appender.cpp                     |   1 +
 src/log/gelf_appender.cpp                     |   0
 src/log/log_message.cpp                       |   0
 src/log/logger.cpp                            |   0
 src/log/logger_config.cpp                     |   0
 src/network/http/http_connection.cpp          |   0
 src/network/http/http_server.cpp              |   0
 src/network/http/websocket.cpp                |   0
 src/network/ip.cpp                            |   0
 src/network/ntp.cpp                           |   0
 src/network/rate_limiting.cpp                 |   0
 src/network/resolve.cpp                       |   0
 src/network/tcp_socket.cpp                    |  10 +-
 src/network/udp_socket.cpp                    |   0
 src/network/url.cpp                           |   0
 src/real128.cpp                               |   0
 src/rpc/bstate.cpp                            |   0
 src/rpc/cli.cpp                               |   0
 src/rpc/http_api.cpp                          |   0
 src/rpc/json_connection.cpp                   |   0
 src/rpc/state.cpp                             |   0
 src/rpc/websocket_api.cpp                     |   0
 src/shared_ptr.cpp                            |   0
 src/string.cpp                                |   0
 src/thread/context.hpp                        |  17 +-
 src/thread/future.cpp                         |   0
 src/thread/mutex.cpp                          |   0
 src/thread/non_preemptable_scope_check.cpp    |   0
 src/thread/spin_lock.cpp                      |   0
 src/thread/spin_yield_lock.cpp                |   0
 src/thread/task.cpp                           |   0
 src/thread/thread.cpp                         |   0
 src/thread/thread_d.hpp                       |  21 +-
 src/thread/thread_specific.cpp                |   0
 src/time.cpp                                  |   0
 src/uint128.cpp                               |   0
 src/utf8.cpp                                  |   0
 src/utf8/ReleaseNotes                         |   0
 src/utf8/checked.h                            |   0
 src/utf8/core.h                               |   0
 src/utf8/unchecked.h                          |   0
 src/utf8/utf8cpp.html                         |   0
 src/variant.cpp                               |   0
 src/variant_object.cpp                        |   0
 tests/CMakeLists.txt                          |   4 +-
 tests/all_tests.cpp                           |   0
 tests/api.cpp                                 |   0
 tests/bip_lock.cpp                            |   0
 tests/blinding_test.cpp                       |   3 +-
 tests/bloom_test.cpp                          |   0
 tests/compress/compress.cpp                   |   0
 tests/crypto/aes_test.cpp                     |   0
 tests/crypto/base_n_tests.cpp                 |   0
 tests/crypto/bigint_test.cpp                  |   0
 tests/crypto/blind.cpp                        |   0
 tests/crypto/blowfish_test.cpp                |   0
 tests/crypto/dh_test.cpp                      |   0
 tests/crypto/ecc_test.cpp                     |   0
 tests/crypto/log_test.cpp                     |   0
 tests/crypto/rand_test.cpp                    |   0
 tests/crypto/sha_tests.cpp                    |   0
 tests/hmac_test.cpp                           |   0
 tests/network/http/websocket_test.cpp         |   0
 tests/rate_limiting.cpp                       |   0
 tests/real128_test.cpp                        |   0
 tests/rpc.cpp                                 |   0
 tests/sleep.cpp                               |   0
 tests/thread/task_cancel.cpp                  |   0
 tests/thread/thread_tests.cpp                 |  95 ++++
 tests/utf8_test.cpp                           |   0
 vendor/boost_1.51/include/boost/process.hpp   |  25 -
 .../boost_1.51/include/boost/process/all.hpp  |  40 --
 .../include/boost/process/child.hpp           | 100 ----
 .../include/boost/process/config.hpp          |  74 ---
 .../include/boost/process/context.hpp         | 139 ------
 .../boost/process/detail/basic_status.hpp     |  69 ---
 .../process/detail/basic_status_service.hpp   | 323 -------------
 .../boost/process/detail/posix_helpers.hpp    | 106 -----
 .../boost/process/detail/status_impl.hpp      | 190 --------
 .../boost/process/detail/systembuf.hpp        | 228 ---------
 .../boost/process/detail/windows_helpers.hpp  | 138 ------
 .../include/boost/process/environment.hpp     |  52 ---
 .../include/boost/process/handle.hpp          | 231 ---------
 .../include/boost/process/operations.hpp      | 439 ------------------
 .../include/boost/process/pid_type.hpp        |  56 ---
 .../boost_1.51/include/boost/process/pipe.hpp |  49 --
 .../include/boost/process/pistream.hpp        | 114 -----
 .../include/boost/process/postream.hpp        | 115 -----
 .../include/boost/process/process.hpp         | 213 ---------
 .../boost_1.51/include/boost/process/self.hpp | 188 --------
 .../include/boost/process/status.hpp          |  41 --
 .../include/boost/process/stream_behavior.hpp | 326 -------------
 .../include/boost/process/stream_ends.hpp     |  68 ---
 .../include/boost/process/stream_id.hpp       |  50 --
 .../include/boost/process/stream_type.hpp     |  45 --
 .../context/asm/fcontext_arm_aapcs_elf_gas.S  | 101 ----
 .../context/asm/fcontext_i386_ms_pe_masm.asm  | 151 ------
 .../context/asm/fcontext_i386_sysv_elf_gas.S  | 122 -----
 .../asm/fcontext_i386_sysv_macho_gas.S        | 118 -----
 .../context/asm/fcontext_mips32_o32_elf_gas.S | 144 ------
 .../context/asm/fcontext_ppc32_sysv_elf_gas.S | 222 ---------
 .../context/asm/fcontext_ppc64_sysv_elf_gas.S | 250 ----------
 .../asm/fcontext_x86_64_ms_pe_masm.asm        | 207 ---------
 .../asm/fcontext_x86_64_sysv_elf_gas.S        | 116 -----
 .../asm/fcontext_x86_64_sysv_macho_gas.S      | 111 -----
 vendor/boost_1.51/libs/context/fcontext.cpp   |  36 --
 vendor/boost_1.51/libs/context/seh.cpp        |  83 ----
 .../libs/context/stack_allocator_posix.cpp    |  85 ----
 .../libs/context/stack_allocator_windows.cpp  |  86 ----
 .../libs/context/stack_utils_posix.cpp        |  81 ----
 .../libs/context/stack_utils_windows.cpp      |  84 ----
 vendor/diff-match-patch-cpp-stl               |   1 -
 315 files changed, 282 insertions(+), 5826 deletions(-)
 mode change 100644 => 100755 .gitignore
 mode change 100644 => 100755 .gitmodules
 mode change 100644 => 100755 CMakeLists.txt
 mode change 100644 => 100755 CMakeModules/ArgumentParser.cmake
 mode change 100644 => 100755 CMakeModules/FindBoost.cmake
 mode change 100644 => 100755 CMakeModules/FindReadline.cmake
 mode change 100644 => 100755 CMakeModules/FindVLD.cmake
 mode change 100644 => 100755 CMakeModules/ParseLibraryList.cmake
 mode change 100644 => 100755 CMakeModules/SetupTargetMacros.cmake
 mode change 100644 => 100755 CMakeModules/UseLibraryMacros.cmake
 mode change 100644 => 100755 CMakeModules/VersionMacros.cmake
 mode change 100644 => 100755 GitVersionGen/GetGitRevisionDescription.cmake
 mode change 100644 => 100755 GitVersionGen/GetGitRevisionDescription.cmake.in
 mode change 100644 => 100755 README-ecc.md
 mode change 100644 => 100755 README.md
 mode change 100644 => 100755 fc.natvis
 mode change 100644 => 100755 include/fc/actor.hpp
 mode change 100644 => 100755 include/fc/aligned.hpp
 mode change 100644 => 100755 include/fc/any.hpp
 mode change 100644 => 100755 include/fc/api.hpp
 mode change 100644 => 100755 include/fc/array.hpp
 mode change 100644 => 100755 include/fc/asio.hpp
 mode change 100644 => 100755 include/fc/bitutil.hpp
 mode change 100644 => 100755 include/fc/bloom_filter.hpp
 mode change 100644 => 100755 include/fc/compress/smaz.hpp
 mode change 100644 => 100755 include/fc/compress/zlib.hpp
 mode change 100644 => 100755 include/fc/container/deque.hpp
 mode change 100644 => 100755 include/fc/container/deque_fwd.hpp
 mode change 100644 => 100755 include/fc/container/flat.hpp
 mode change 100644 => 100755 include/fc/container/flat_fwd.hpp
 mode change 100644 => 100755 include/fc/crypto/aes.hpp
 mode change 100644 => 100755 include/fc/crypto/base36.hpp
 mode change 100644 => 100755 include/fc/crypto/base58.hpp
 mode change 100644 => 100755 include/fc/crypto/base64.hpp
 mode change 100644 => 100755 include/fc/crypto/bigint.hpp
 mode change 100644 => 100755 include/fc/crypto/blowfish.hpp
 mode change 100644 => 100755 include/fc/crypto/city.hpp
 mode change 100644 => 100755 include/fc/crypto/dh.hpp
 mode change 100644 => 100755 include/fc/crypto/digest.hpp
 mode change 100644 => 100755 include/fc/crypto/elliptic.hpp
 mode change 100644 => 100755 include/fc/crypto/hash_ctr_rng.hpp
 mode change 100644 => 100755 include/fc/crypto/hex.hpp
 mode change 100644 => 100755 include/fc/crypto/hmac.hpp
 mode change 100644 => 100755 include/fc/crypto/md5.hpp
 mode change 100644 => 100755 include/fc/crypto/openssl.hpp
 mode change 100644 => 100755 include/fc/crypto/pke.hpp
 mode change 100644 => 100755 include/fc/crypto/rand.hpp
 mode change 100644 => 100755 include/fc/crypto/ripemd160.hpp
 mode change 100644 => 100755 include/fc/crypto/sha1.hpp
 mode change 100644 => 100755 include/fc/crypto/sha224.hpp
 mode change 100644 => 100755 include/fc/crypto/sha256.hpp
 mode change 100644 => 100755 include/fc/crypto/sha512.hpp
 mode change 100644 => 100755 include/fc/exception/exception.hpp
 mode change 100644 => 100755 include/fc/filesystem.hpp
 mode change 100644 => 100755 include/fc/fixed_string.hpp
 mode change 100644 => 100755 include/fc/fwd.hpp
 mode change 100644 => 100755 include/fc/fwd_impl.hpp
 mode change 100644 => 100755 include/fc/git_revision.hpp
 mode change 100644 => 100755 include/fc/interprocess/container.hpp
 mode change 100644 => 100755 include/fc/interprocess/file_mapping.hpp
 mode change 100644 => 100755 include/fc/interprocess/file_mutex.hpp
 mode change 100644 => 100755 include/fc/interprocess/iprocess.hpp
 mode change 100644 => 100755 include/fc/interprocess/mmap_struct.hpp
 mode change 100644 => 100755 include/fc/interprocess/process.hpp
 mode change 100644 => 100755 include/fc/interprocess/signals.hpp
 mode change 100644 => 100755 include/fc/io/buffered_iostream.hpp
 mode change 100644 => 100755 include/fc/io/console.hpp
 mode change 100644 => 100755 include/fc/io/datastream.hpp
 mode change 100644 => 100755 include/fc/io/datastream_back.hpp
 mode change 100644 => 100755 include/fc/io/enum_type.hpp
 mode change 100644 => 100755 include/fc/io/fstream.hpp
 mode change 100644 => 100755 include/fc/io/iobuffer.hpp
 mode change 100644 => 100755 include/fc/io/iostream.hpp
 mode change 100644 => 100755 include/fc/io/json.hpp
 mode change 100644 => 100755 include/fc/io/json_relaxed.hpp
 mode change 100644 => 100755 include/fc/io/raw.hpp
 mode change 100644 => 100755 include/fc/io/raw_fwd.hpp
 mode change 100644 => 100755 include/fc/io/raw_unpack_file.hpp
 mode change 100644 => 100755 include/fc/io/raw_variant.hpp
 mode change 100644 => 100755 include/fc/io/sstream.hpp
 mode change 100644 => 100755 include/fc/io/stdio.hpp
 mode change 100644 => 100755 include/fc/io/varint.hpp
 mode change 100644 => 100755 include/fc/log/appender.hpp
 mode change 100644 => 100755 include/fc/log/console_appender.hpp
 mode change 100644 => 100755 include/fc/log/file_appender.hpp
 mode change 100644 => 100755 include/fc/log/gelf_appender.hpp
 mode change 100644 => 100755 include/fc/log/log_message.hpp
 mode change 100644 => 100755 include/fc/log/logger.hpp
 mode change 100644 => 100755 include/fc/log/logger_config.hpp
 mode change 100644 => 100755 include/fc/make_fused.hpp
 mode change 100644 => 100755 include/fc/network/http/connection.hpp
 mode change 100644 => 100755 include/fc/network/http/server.hpp
 mode change 100644 => 100755 include/fc/network/http/websocket.hpp
 mode change 100644 => 100755 include/fc/network/ip.hpp
 mode change 100644 => 100755 include/fc/network/ntp.hpp
 mode change 100644 => 100755 include/fc/network/rate_limiting.hpp
 mode change 100644 => 100755 include/fc/network/resolve.hpp
 mode change 100644 => 100755 include/fc/network/tcp_socket.hpp
 mode change 100644 => 100755 include/fc/network/tcp_socket_io_hooks.hpp
 mode change 100644 => 100755 include/fc/network/udp_socket.hpp
 mode change 100644 => 100755 include/fc/network/url.hpp
 mode change 100644 => 100755 include/fc/noncopyable.hpp
 mode change 100644 => 100755 include/fc/optional.hpp
 mode change 100644 => 100755 include/fc/platform_independence.hpp
 mode change 100644 => 100755 include/fc/real128.hpp
 mode change 100644 => 100755 include/fc/reflect/reflect.hpp
 mode change 100644 => 100755 include/fc/reflect/typename.hpp
 mode change 100644 => 100755 include/fc/reflect/variant.hpp
 mode change 100644 => 100755 include/fc/rpc/api_connection.hpp
 mode change 100644 => 100755 include/fc/rpc/binary_api_connection.hpp
 mode change 100644 => 100755 include/fc/rpc/bstate.hpp
 mode change 100644 => 100755 include/fc/rpc/cli.hpp
 mode change 100644 => 100755 include/fc/rpc/http_api.hpp
 mode change 100644 => 100755 include/fc/rpc/json_connection.hpp
 mode change 100644 => 100755 include/fc/rpc/state.hpp
 mode change 100644 => 100755 include/fc/rpc/variant_connection.hpp
 mode change 100644 => 100755 include/fc/rpc/variant_stream.hpp
 mode change 100644 => 100755 include/fc/rpc/websocket_api.hpp
 mode change 100644 => 100755 include/fc/safe.hpp
 mode change 100644 => 100755 include/fc/scoped_exit.hpp
 mode change 100644 => 100755 include/fc/shared_ptr.hpp
 mode change 100644 => 100755 include/fc/signal.hpp
 mode change 100644 => 100755 include/fc/signals.hpp
 mode change 100644 => 100755 include/fc/smart_ref_fwd.hpp
 mode change 100644 => 100755 include/fc/smart_ref_impl.hpp
 mode change 100644 => 100755 include/fc/static_variant.hpp
 mode change 100644 => 100755 include/fc/string.hpp
 mode change 100644 => 100755 include/fc/thread/future.hpp
 mode change 100644 => 100755 include/fc/thread/mutex.hpp
 mode change 100644 => 100755 include/fc/thread/non_preemptable_scope_check.hpp
 mode change 100644 => 100755 include/fc/thread/priority.hpp
 mode change 100644 => 100755 include/fc/thread/scoped_lock.hpp
 mode change 100644 => 100755 include/fc/thread/spin_lock.hpp
 mode change 100644 => 100755 include/fc/thread/spin_yield_lock.hpp
 mode change 100644 => 100755 include/fc/thread/task.hpp
 mode change 100644 => 100755 include/fc/thread/thread.hpp
 mode change 100644 => 100755 include/fc/thread/thread_specific.hpp
 mode change 100644 => 100755 include/fc/thread/unique_lock.hpp
 mode change 100644 => 100755 include/fc/thread/wait_condition.hpp
 mode change 100644 => 100755 include/fc/time.hpp
 mode change 100644 => 100755 include/fc/tuple.hpp
 mode change 100644 => 100755 include/fc/uint128.hpp
 mode change 100644 => 100755 include/fc/unique_ptr.hpp
 mode change 100644 => 100755 include/fc/utf8.hpp
 mode change 100644 => 100755 include/fc/utility.hpp
 mode change 100644 => 100755 include/fc/variant.hpp
 mode change 100644 => 100755 include/fc/variant_object.hpp
 mode change 100644 => 100755 include/fc/vector.hpp
 mode change 100644 => 100755 include/fc/vector_fwd.hpp
 mode change 100644 => 100755 include/fc/wait_any.hpp
 mode change 100644 => 100755 src/asio.cpp
 mode change 100644 => 100755 src/byteswap.hpp
 mode change 100644 => 100755 src/compress/miniz.c
 mode change 100644 => 100755 src/compress/smaz.cpp
 mode change 100644 => 100755 src/compress/zlib.cpp
 mode change 100644 => 100755 src/crypto/_digest_common.cpp
 mode change 100644 => 100755 src/crypto/_digest_common.hpp
 mode change 100644 => 100755 src/crypto/_elliptic_impl_priv.hpp
 mode change 100644 => 100755 src/crypto/_elliptic_impl_pub.hpp
 mode change 100644 => 100755 src/crypto/aes.cpp
 mode change 100644 => 100755 src/crypto/base36.cpp
 mode change 100644 => 100755 src/crypto/base58.cpp
 mode change 100644 => 100755 src/crypto/base64.cpp
 mode change 100644 => 100755 src/crypto/bigint.cpp
 mode change 100644 => 100755 src/crypto/blowfish.cpp
 mode change 100644 => 100755 src/crypto/city.cpp
 mode change 100644 => 100755 src/crypto/crc.cpp
 mode change 100644 => 100755 src/crypto/dh.cpp
 mode change 100644 => 100755 src/crypto/elliptic_common.cpp
 mode change 100644 => 100755 src/crypto/elliptic_impl_priv.cpp
 mode change 100644 => 100755 src/crypto/elliptic_impl_pub.cpp
 mode change 100644 => 100755 src/crypto/elliptic_mixed.cpp
 mode change 100644 => 100755 src/crypto/elliptic_openssl.cpp
 mode change 100644 => 100755 src/crypto/elliptic_secp256k1.cpp
 mode change 100644 => 100755 src/crypto/hex.cpp
 mode change 100644 => 100755 src/crypto/md5.cpp
 mode change 100644 => 100755 src/crypto/openssl.cpp
 mode change 100644 => 100755 src/crypto/pke.cpp
 mode change 100644 => 100755 src/crypto/rand.cpp
 mode change 100644 => 100755 src/crypto/ripemd160.cpp
 mode change 100644 => 100755 src/crypto/sha1.cpp
 mode change 100644 => 100755 src/crypto/sha224.cpp
 mode change 100644 => 100755 src/crypto/sha256.cpp
 mode change 100644 => 100755 src/crypto/sha512.cpp
 mode change 100644 => 100755 src/exception.cpp
 mode change 100644 => 100755 src/filesystem.cpp
 mode change 100644 => 100755 src/git_revision.cpp.in
 mode change 100644 => 100755 src/interprocess/file_mapping.cpp
 mode change 100644 => 100755 src/interprocess/file_mutex.cpp
 mode change 100644 => 100755 src/interprocess/mmap_struct.cpp
 mode change 100644 => 100755 src/interprocess/process.cpp
 mode change 100644 => 100755 src/interprocess/signals.cpp
 mode change 100644 => 100755 src/io/buffered_iostream.cpp
 mode change 100644 => 100755 src/io/console.cpp
 mode change 100644 => 100755 src/io/datastream.cpp
 mode change 100644 => 100755 src/io/fstream.cpp
 mode change 100644 => 100755 src/io/iostream.cpp
 mode change 100644 => 100755 src/io/json.cpp
 mode change 100644 => 100755 src/io/sstream.cpp
 mode change 100644 => 100755 src/io/varint.cpp
 mode change 100644 => 100755 src/log/appender.cpp
 mode change 100644 => 100755 src/log/console_appender.cpp
 mode change 100644 => 100755 src/log/console_defines.h
 mode change 100644 => 100755 src/log/file_appender.cpp
 mode change 100644 => 100755 src/log/gelf_appender.cpp
 mode change 100644 => 100755 src/log/log_message.cpp
 mode change 100644 => 100755 src/log/logger.cpp
 mode change 100644 => 100755 src/log/logger_config.cpp
 mode change 100644 => 100755 src/network/http/http_connection.cpp
 mode change 100644 => 100755 src/network/http/http_server.cpp
 mode change 100644 => 100755 src/network/http/websocket.cpp
 mode change 100644 => 100755 src/network/ip.cpp
 mode change 100644 => 100755 src/network/ntp.cpp
 mode change 100644 => 100755 src/network/rate_limiting.cpp
 mode change 100644 => 100755 src/network/resolve.cpp
 mode change 100644 => 100755 src/network/tcp_socket.cpp
 mode change 100644 => 100755 src/network/udp_socket.cpp
 mode change 100644 => 100755 src/network/url.cpp
 mode change 100644 => 100755 src/real128.cpp
 mode change 100644 => 100755 src/rpc/bstate.cpp
 mode change 100644 => 100755 src/rpc/cli.cpp
 mode change 100644 => 100755 src/rpc/http_api.cpp
 mode change 100644 => 100755 src/rpc/json_connection.cpp
 mode change 100644 => 100755 src/rpc/state.cpp
 mode change 100644 => 100755 src/rpc/websocket_api.cpp
 mode change 100644 => 100755 src/shared_ptr.cpp
 mode change 100644 => 100755 src/string.cpp
 mode change 100644 => 100755 src/thread/context.hpp
 mode change 100644 => 100755 src/thread/future.cpp
 mode change 100644 => 100755 src/thread/mutex.cpp
 mode change 100644 => 100755 src/thread/non_preemptable_scope_check.cpp
 mode change 100644 => 100755 src/thread/spin_lock.cpp
 mode change 100644 => 100755 src/thread/spin_yield_lock.cpp
 mode change 100644 => 100755 src/thread/task.cpp
 mode change 100644 => 100755 src/thread/thread.cpp
 mode change 100644 => 100755 src/thread/thread_d.hpp
 mode change 100644 => 100755 src/thread/thread_specific.cpp
 mode change 100644 => 100755 src/time.cpp
 mode change 100644 => 100755 src/uint128.cpp
 mode change 100644 => 100755 src/utf8.cpp
 mode change 100644 => 100755 src/utf8/ReleaseNotes
 mode change 100644 => 100755 src/utf8/checked.h
 mode change 100644 => 100755 src/utf8/core.h
 mode change 100644 => 100755 src/utf8/unchecked.h
 mode change 100644 => 100755 src/utf8/utf8cpp.html
 mode change 100644 => 100755 src/variant.cpp
 mode change 100644 => 100755 src/variant_object.cpp
 mode change 100644 => 100755 tests/CMakeLists.txt
 mode change 100644 => 100755 tests/all_tests.cpp
 mode change 100644 => 100755 tests/api.cpp
 mode change 100644 => 100755 tests/bip_lock.cpp
 mode change 100644 => 100755 tests/blinding_test.cpp
 mode change 100644 => 100755 tests/bloom_test.cpp
 mode change 100644 => 100755 tests/compress/compress.cpp
 mode change 100644 => 100755 tests/crypto/aes_test.cpp
 mode change 100644 => 100755 tests/crypto/base_n_tests.cpp
 mode change 100644 => 100755 tests/crypto/bigint_test.cpp
 mode change 100644 => 100755 tests/crypto/blind.cpp
 mode change 100644 => 100755 tests/crypto/blowfish_test.cpp
 mode change 100644 => 100755 tests/crypto/dh_test.cpp
 mode change 100644 => 100755 tests/crypto/ecc_test.cpp
 mode change 100644 => 100755 tests/crypto/log_test.cpp
 mode change 100644 => 100755 tests/crypto/rand_test.cpp
 mode change 100644 => 100755 tests/crypto/sha_tests.cpp
 mode change 100644 => 100755 tests/hmac_test.cpp
 mode change 100644 => 100755 tests/network/http/websocket_test.cpp
 mode change 100644 => 100755 tests/rate_limiting.cpp
 mode change 100644 => 100755 tests/real128_test.cpp
 mode change 100644 => 100755 tests/rpc.cpp
 mode change 100644 => 100755 tests/sleep.cpp
 mode change 100644 => 100755 tests/thread/task_cancel.cpp
 create mode 100755 tests/thread/thread_tests.cpp
 mode change 100644 => 100755 tests/utf8_test.cpp
 delete mode 100644 vendor/boost_1.51/include/boost/process.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/all.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/child.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/config.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/context.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/detail/basic_status.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/detail/basic_status_service.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/detail/posix_helpers.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/detail/status_impl.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/detail/systembuf.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/detail/windows_helpers.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/environment.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/handle.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/operations.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/pid_type.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/pipe.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/pistream.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/postream.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/process.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/self.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/status.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/stream_behavior.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/stream_ends.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/stream_id.hpp
 delete mode 100644 vendor/boost_1.51/include/boost/process/stream_type.hpp
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_arm_aapcs_elf_gas.S
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_i386_ms_pe_masm.asm
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_i386_sysv_elf_gas.S
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_i386_sysv_macho_gas.S
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_mips32_o32_elf_gas.S
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_ppc32_sysv_elf_gas.S
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_ppc64_sysv_elf_gas.S
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_x86_64_ms_pe_masm.asm
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_x86_64_sysv_elf_gas.S
 delete mode 100644 vendor/boost_1.51/libs/context/asm/fcontext_x86_64_sysv_macho_gas.S
 delete mode 100644 vendor/boost_1.51/libs/context/fcontext.cpp
 delete mode 100644 vendor/boost_1.51/libs/context/seh.cpp
 delete mode 100644 vendor/boost_1.51/libs/context/stack_allocator_posix.cpp
 delete mode 100644 vendor/boost_1.51/libs/context/stack_allocator_windows.cpp
 delete mode 100644 vendor/boost_1.51/libs/context/stack_utils_posix.cpp
 delete mode 100644 vendor/boost_1.51/libs/context/stack_utils_windows.cpp
 delete mode 160000 vendor/diff-match-patch-cpp-stl

diff --git a/.gitignore b/.gitignore
old mode 100644
new mode 100755
diff --git a/.gitmodules b/.gitmodules
old mode 100644
new mode 100755
diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100644
new mode 100755
index dafcdb0..bd52180
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,7 +40,7 @@ endif()
 SET (ORIGINAL_LIB_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
 
 SET(BOOST_COMPONENTS)
-LIST(APPEND BOOST_COMPONENTS thread date_time system filesystem program_options signals serialization chrono unit_test_framework context locale iostreams)
+LIST(APPEND BOOST_COMPONENTS thread date_time filesystem system program_options signals serialization chrono unit_test_framework context locale iostreams)
 SET( Boost_USE_STATIC_LIBS ON CACHE STRING "ON or OFF" )
 
 IF( ECC_IMPL STREQUAL openssl )
@@ -190,7 +190,6 @@ set( fc_sources
      src/io/varint.cpp
      src/io/console.cpp
      src/filesystem.cpp
-     src/interprocess/process.cpp
      src/interprocess/signals.cpp
      src/interprocess/file_mapping.cpp
      src/interprocess/mmap_struct.cpp
@@ -336,15 +335,6 @@ else()
   set( ZLIB_LIBRARIES "" )
 endif( ZLIB_FOUND )
 
-find_package( BZip2 )
-if( BZIP2_FOUND )
-   MESSAGE( STATUS "bzip2 found" )
-   add_definitions( -DHAS_BZIP2 )
-else()
-   MESSAGE( STATUS "bzip2 not found" )
-   set( BZIP2_LIBRARIES "" )
-endif( BZIP2_FOUND )
-
 # This will become unnecessary once we update to websocketpp which fixes upstream issue #395
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DWEBSOCKETPP_STRICT_MASKING")
 
@@ -373,7 +363,6 @@ target_include_directories(fc
     "${readline_includes}"
 
   PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/vendor/boost_1.51/include
     ${CMAKE_CURRENT_SOURCE_DIR}/vendor/secp256k1-zkp
   )
 
@@ -381,7 +370,7 @@ target_include_directories(fc
 IF(NOT WIN32)
   set(LINK_USR_LOCAL_LIB -L/usr/local/lib)
 ENDIF()
-target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
+target_link_libraries( fc PUBLIC ${LINK_USR_LOCAL_LIB} ${Boost_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES} ${PLATFORM_SPECIFIC_LIBS} ${RPCRT4} ${CMAKE_DL_LIBS} ${rt_library} ${readline_libraries} ${ECC_LIB} )
 
 if(MSVC)
   set_source_files_properties( src/network/http/websocket.cpp PROPERTIES COMPILE_FLAGS "/bigobj" )
diff --git a/CMakeModules/ArgumentParser.cmake b/CMakeModules/ArgumentParser.cmake
old mode 100644
new mode 100755
diff --git a/CMakeModules/FindBoost.cmake b/CMakeModules/FindBoost.cmake
old mode 100644
new mode 100755
diff --git a/CMakeModules/FindReadline.cmake b/CMakeModules/FindReadline.cmake
old mode 100644
new mode 100755
index f1d0d74..745cfe5
--- a/CMakeModules/FindReadline.cmake
+++ b/CMakeModules/FindReadline.cmake
@@ -45,5 +45,3 @@ mark_as_advanced(
     Readline_INCLUDE_DIR
     Readline_LIBRARY
 )
-
-MESSAGE( STATUS "Found Readline: ${Readline_LIBRARY}" )
diff --git a/CMakeModules/FindVLD.cmake b/CMakeModules/FindVLD.cmake
old mode 100644
new mode 100755
diff --git a/CMakeModules/ParseLibraryList.cmake b/CMakeModules/ParseLibraryList.cmake
old mode 100644
new mode 100755
diff --git a/CMakeModules/SetupTargetMacros.cmake b/CMakeModules/SetupTargetMacros.cmake
old mode 100644
new mode 100755
diff --git a/CMakeModules/UseLibraryMacros.cmake b/CMakeModules/UseLibraryMacros.cmake
old mode 100644
new mode 100755
diff --git a/CMakeModules/VersionMacros.cmake b/CMakeModules/VersionMacros.cmake
old mode 100644
new mode 100755
diff --git a/GitVersionGen/GetGitRevisionDescription.cmake b/GitVersionGen/GetGitRevisionDescription.cmake
old mode 100644
new mode 100755
diff --git a/GitVersionGen/GetGitRevisionDescription.cmake.in b/GitVersionGen/GetGitRevisionDescription.cmake.in
old mode 100644
new mode 100755
diff --git a/README-ecc.md b/README-ecc.md
old mode 100644
new mode 100755
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/fc.natvis b/fc.natvis
old mode 100644
new mode 100755
diff --git a/include/fc/actor.hpp b/include/fc/actor.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/aligned.hpp b/include/fc/aligned.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/any.hpp b/include/fc/any.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/api.hpp b/include/fc/api.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/array.hpp b/include/fc/array.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/asio.hpp b/include/fc/asio.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/bitutil.hpp b/include/fc/bitutil.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/bloom_filter.hpp b/include/fc/bloom_filter.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/compress/smaz.hpp b/include/fc/compress/smaz.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/compress/zlib.hpp b/include/fc/compress/zlib.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/container/deque.hpp b/include/fc/container/deque.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/container/deque_fwd.hpp b/include/fc/container/deque_fwd.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/container/flat.hpp b/include/fc/container/flat.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/container/flat_fwd.hpp b/include/fc/container/flat_fwd.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/aes.hpp b/include/fc/crypto/aes.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/base36.hpp b/include/fc/crypto/base36.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/base58.hpp b/include/fc/crypto/base58.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/base64.hpp b/include/fc/crypto/base64.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/bigint.hpp b/include/fc/crypto/bigint.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/blowfish.hpp b/include/fc/crypto/blowfish.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/city.hpp b/include/fc/crypto/city.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/dh.hpp b/include/fc/crypto/dh.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/digest.hpp b/include/fc/crypto/digest.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/elliptic.hpp b/include/fc/crypto/elliptic.hpp
old mode 100644
new mode 100755
index 7d3046f..bc1eae9
--- a/include/fc/crypto/elliptic.hpp
+++ b/include/fc/crypto/elliptic.hpp
@@ -25,9 +25,7 @@ namespace fc {
     typedef fc::array<unsigned char,65> compact_signature;
     typedef std::vector<char>           range_proof_type;
     typedef fc::array<char,78>          extended_key_data;
-    typedef fc::sha256                  blinded_hash;
-    typedef fc::sha256                  blind_signature;
-
+ 
     /**
      *  @class public_key
      *  @brief contains only the public point of an elliptic curve key.
@@ -38,7 +36,6 @@ namespace fc {
            public_key();
            public_key(const public_key& k);
            ~public_key();
-//           bool verify( const fc::sha256& digest, const signature& sig );
            public_key_data serialize()const;
            public_key_point_data serialize_ecc_point()const;
 
@@ -52,8 +49,6 @@ namespace fc {
            public_key child( const fc::sha256& offset )const;
 
            bool valid()const;
-           /** Computes new pubkey = generator * offset + old pubkey ?! */
-//           public_key mult( const fc::sha256& offset )const;
            /** Computes new pubkey = regenerate(offset).pubkey + old pubkey
             *                      = offset * G + 1 * old pubkey ?! */
            public_key add( const fc::sha256& offset )const;
@@ -164,8 +159,6 @@ namespace fc {
             fc::string to_base58() const { return str(); }
             static extended_public_key from_base58( const fc::string& base58 );
 
-            public_key generate_p( int i ) const;
-            public_key generate_q( int i ) const;
         private:
             sha256 c;
             int child_num, parent_fp;
@@ -192,25 +185,10 @@ namespace fc {
             static extended_private_key generate_master( const fc::string& seed );
             static extended_private_key generate_master( const char* seed, uint32_t seed_len );
 
-            // Oleg Andreev's blind signature scheme,
-            // see http://blog.oleganza.com/post/77474860538/blind-signatures
-            public_key blind_public_key( const extended_public_key& bob, int i ) const;
-            blinded_hash blind_hash( const fc::sha256& hash, int i ) const;
-            blind_signature blind_sign( const blinded_hash& hash, int i ) const;
-            // WARNING! This may produce non-canonical signatures!
-            compact_signature unblind_signature( const extended_public_key& bob,
-                                                 const blind_signature& sig,
-                                                 const fc::sha256& hash, int i ) const;
-
         private:
             extended_private_key private_derive_rest( const fc::sha512& hash,
                                                       int num ) const;
-            private_key generate_a( int i ) const;
-            private_key generate_b( int i ) const;
-            private_key generate_c( int i ) const;
-            private_key generate_d( int i ) const;
-            private_key_secret compute_p( int i ) const;
-            private_key_secret compute_q( int i, const private_key_secret& p ) const;
+
             sha256 c;
             int child_num, parent_fp;
             uint8_t depth;
diff --git a/include/fc/crypto/hash_ctr_rng.hpp b/include/fc/crypto/hash_ctr_rng.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/hex.hpp b/include/fc/crypto/hex.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/hmac.hpp b/include/fc/crypto/hmac.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/md5.hpp b/include/fc/crypto/md5.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/openssl.hpp b/include/fc/crypto/openssl.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/pke.hpp b/include/fc/crypto/pke.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/rand.hpp b/include/fc/crypto/rand.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/ripemd160.hpp b/include/fc/crypto/ripemd160.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/sha1.hpp b/include/fc/crypto/sha1.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/sha224.hpp b/include/fc/crypto/sha224.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/crypto/sha256.hpp b/include/fc/crypto/sha256.hpp
old mode 100644
new mode 100755
index 58bba9e..39b436b
--- a/include/fc/crypto/sha256.hpp
+++ b/include/fc/crypto/sha256.hpp
@@ -119,16 +119,6 @@ namespace std
     };
 }
 
-namespace boost
-{
-    template<>
-    struct hash<fc::sha256>
-    {
-       size_t operator()( const fc::sha256& s )const
-       {
-           return  s._hash[3];//*((size_t*)&s);
-       }
-    };
-}
+
 #include <fc/reflect/reflect.hpp>
 FC_REFLECT_TYPENAME( fc::sha256 )
diff --git a/include/fc/crypto/sha512.hpp b/include/fc/crypto/sha512.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/exception/exception.hpp b/include/fc/exception/exception.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/filesystem.hpp b/include/fc/filesystem.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/fixed_string.hpp b/include/fc/fixed_string.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/fwd.hpp b/include/fc/fwd.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/fwd_impl.hpp b/include/fc/fwd_impl.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/git_revision.hpp b/include/fc/git_revision.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/interprocess/container.hpp b/include/fc/interprocess/container.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/interprocess/file_mapping.hpp b/include/fc/interprocess/file_mapping.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/interprocess/file_mutex.hpp b/include/fc/interprocess/file_mutex.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/interprocess/iprocess.hpp b/include/fc/interprocess/iprocess.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/interprocess/mmap_struct.hpp b/include/fc/interprocess/mmap_struct.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/interprocess/process.hpp b/include/fc/interprocess/process.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/interprocess/signals.hpp b/include/fc/interprocess/signals.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/buffered_iostream.hpp b/include/fc/io/buffered_iostream.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/console.hpp b/include/fc/io/console.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/datastream.hpp b/include/fc/io/datastream.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/datastream_back.hpp b/include/fc/io/datastream_back.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/enum_type.hpp b/include/fc/io/enum_type.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/fstream.hpp b/include/fc/io/fstream.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/iobuffer.hpp b/include/fc/io/iobuffer.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/iostream.hpp b/include/fc/io/iostream.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/json.hpp b/include/fc/io/json.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/json_relaxed.hpp b/include/fc/io/json_relaxed.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/raw.hpp b/include/fc/io/raw.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/raw_fwd.hpp b/include/fc/io/raw_fwd.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/raw_unpack_file.hpp b/include/fc/io/raw_unpack_file.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/raw_variant.hpp b/include/fc/io/raw_variant.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/sstream.hpp b/include/fc/io/sstream.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/stdio.hpp b/include/fc/io/stdio.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/io/varint.hpp b/include/fc/io/varint.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/log/appender.hpp b/include/fc/log/appender.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/log/console_appender.hpp b/include/fc/log/console_appender.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/log/file_appender.hpp b/include/fc/log/file_appender.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/log/gelf_appender.hpp b/include/fc/log/gelf_appender.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/log/log_message.hpp b/include/fc/log/log_message.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/log/logger.hpp b/include/fc/log/logger.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/log/logger_config.hpp b/include/fc/log/logger_config.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/make_fused.hpp b/include/fc/make_fused.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/http/connection.hpp b/include/fc/network/http/connection.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/http/server.hpp b/include/fc/network/http/server.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/http/websocket.hpp b/include/fc/network/http/websocket.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/ip.hpp b/include/fc/network/ip.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/ntp.hpp b/include/fc/network/ntp.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/rate_limiting.hpp b/include/fc/network/rate_limiting.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/resolve.hpp b/include/fc/network/resolve.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/tcp_socket.hpp b/include/fc/network/tcp_socket.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/tcp_socket_io_hooks.hpp b/include/fc/network/tcp_socket_io_hooks.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/udp_socket.hpp b/include/fc/network/udp_socket.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/network/url.hpp b/include/fc/network/url.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/noncopyable.hpp b/include/fc/noncopyable.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/optional.hpp b/include/fc/optional.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/platform_independence.hpp b/include/fc/platform_independence.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/real128.hpp b/include/fc/real128.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/reflect/reflect.hpp b/include/fc/reflect/reflect.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/reflect/typename.hpp b/include/fc/reflect/typename.hpp
old mode 100644
new mode 100755
index 312c927..5cd55c9
--- a/include/fc/reflect/typename.hpp
+++ b/include/fc/reflect/typename.hpp
@@ -15,7 +15,7 @@ namespace fc {
   class exception;
   namespace ip { class address; }
 
-  template<typename T> class get_typename{};
+  template<typename... T> struct get_typename;
   template<> struct get_typename<int32_t>  { static const char* name()  { return "int32_t";  } };
   template<> struct get_typename<int64_t>  { static const char* name()  { return "int64_t";  } };
   template<> struct get_typename<int16_t>  { static const char* name()  { return "int16_t";  } };
diff --git a/include/fc/reflect/variant.hpp b/include/fc/reflect/variant.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/api_connection.hpp b/include/fc/rpc/api_connection.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/binary_api_connection.hpp b/include/fc/rpc/binary_api_connection.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/bstate.hpp b/include/fc/rpc/bstate.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/cli.hpp b/include/fc/rpc/cli.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/http_api.hpp b/include/fc/rpc/http_api.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/json_connection.hpp b/include/fc/rpc/json_connection.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/state.hpp b/include/fc/rpc/state.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/variant_connection.hpp b/include/fc/rpc/variant_connection.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/variant_stream.hpp b/include/fc/rpc/variant_stream.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/rpc/websocket_api.hpp b/include/fc/rpc/websocket_api.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/safe.hpp b/include/fc/safe.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/scoped_exit.hpp b/include/fc/scoped_exit.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/shared_ptr.hpp b/include/fc/shared_ptr.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/signal.hpp b/include/fc/signal.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/signals.hpp b/include/fc/signals.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/smart_ref_fwd.hpp b/include/fc/smart_ref_fwd.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/smart_ref_impl.hpp b/include/fc/smart_ref_impl.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/static_variant.hpp b/include/fc/static_variant.hpp
old mode 100644
new mode 100755
index 9aab790..d6206c2
--- a/include/fc/static_variant.hpp
+++ b/include/fc/static_variant.hpp
@@ -382,5 +382,5 @@ struct visitor {
       s.visit( to_static_variant(ar[1]) );
    }
 
-  template<typename... T> struct get_typename<T...>  { static const char* name()   { return typeid(static_variant<T...>).name();   } };
+  template<typename... T> struct get_typename  { static const char* name()   { return typeid(static_variant<T...>).name();   } };
 } // namespace fc
diff --git a/include/fc/string.hpp b/include/fc/string.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/future.hpp b/include/fc/thread/future.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/mutex.hpp b/include/fc/thread/mutex.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/non_preemptable_scope_check.hpp b/include/fc/thread/non_preemptable_scope_check.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/priority.hpp b/include/fc/thread/priority.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/scoped_lock.hpp b/include/fc/thread/scoped_lock.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/spin_lock.hpp b/include/fc/thread/spin_lock.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/spin_yield_lock.hpp b/include/fc/thread/spin_yield_lock.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/task.hpp b/include/fc/thread/task.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/thread.hpp b/include/fc/thread/thread.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/thread_specific.hpp b/include/fc/thread/thread_specific.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/unique_lock.hpp b/include/fc/thread/unique_lock.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/thread/wait_condition.hpp b/include/fc/thread/wait_condition.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/time.hpp b/include/fc/time.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/tuple.hpp b/include/fc/tuple.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/uint128.hpp b/include/fc/uint128.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/unique_ptr.hpp b/include/fc/unique_ptr.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/utf8.hpp b/include/fc/utf8.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/utility.hpp b/include/fc/utility.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/variant.hpp b/include/fc/variant.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/variant_object.hpp b/include/fc/variant_object.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/vector.hpp b/include/fc/vector.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/vector_fwd.hpp b/include/fc/vector_fwd.hpp
old mode 100644
new mode 100755
diff --git a/include/fc/wait_any.hpp b/include/fc/wait_any.hpp
old mode 100644
new mode 100755
diff --git a/src/asio.cpp b/src/asio.cpp
old mode 100644
new mode 100755
diff --git a/src/byteswap.hpp b/src/byteswap.hpp
old mode 100644
new mode 100755
diff --git a/src/compress/miniz.c b/src/compress/miniz.c
old mode 100644
new mode 100755
diff --git a/src/compress/smaz.cpp b/src/compress/smaz.cpp
old mode 100644
new mode 100755
diff --git a/src/compress/zlib.cpp b/src/compress/zlib.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/_digest_common.cpp b/src/crypto/_digest_common.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/_digest_common.hpp b/src/crypto/_digest_common.hpp
old mode 100644
new mode 100755
diff --git a/src/crypto/_elliptic_impl_priv.hpp b/src/crypto/_elliptic_impl_priv.hpp
old mode 100644
new mode 100755
diff --git a/src/crypto/_elliptic_impl_pub.hpp b/src/crypto/_elliptic_impl_pub.hpp
old mode 100644
new mode 100755
diff --git a/src/crypto/aes.cpp b/src/crypto/aes.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/base36.cpp b/src/crypto/base36.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/base58.cpp b/src/crypto/base58.cpp
old mode 100644
new mode 100755
index e1d5d33..ad1b7de
--- a/src/crypto/base58.cpp
+++ b/src/crypto/base58.cpp
@@ -66,74 +66,72 @@ class CAutoBN_CTX
 
 
 /** C++ wrapper for BIGNUM (OpenSSL bignum) */
-class CBigNum : public BIGNUM
+class CBigNum
 {
+    BIGNUM* bn;
 public:
     CBigNum()
-    {
-        BN_init(this);
-    }
+       : bn(BN_new()) {}
 
     CBigNum(const CBigNum& b)
+        : CBigNum()
     {
-        BN_init(this);
-        if (!BN_copy(this, &b))
+        if (!BN_copy(bn, b.bn))
         {
-            BN_clear_free(this);
+            BN_clear_free(bn);
             throw bignum_error("CBigNum::CBigNum(const CBigNum&) : BN_copy failed");
         }
     }
 
     CBigNum& operator=(const CBigNum& b)
     {
-        if (!BN_copy(this, &b))
+        if (!BN_copy(bn, b.bn))
             throw bignum_error("CBigNum::operator= : BN_copy failed");
         return (*this);
     }
 
     ~CBigNum()
     {
-        BN_clear_free(this);
+        BN_clear_free(bn);
     }
 
     //CBigNum(char n) is not portable.  Use 'signed char' or 'unsigned char'.
-    CBigNum(signed char n)      { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(short n)            { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(int n)              { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
-    //CBigNum(long n)             { BN_init(this); if (n >= 0) setulong(n); else setint64(n); }
-    CBigNum(int64_t n)          { BN_init(this); setint64(n); }
-    CBigNum(unsigned char n)    { BN_init(this); setulong(n); }
-    CBigNum(unsigned short n)   { BN_init(this); setulong(n); }
-    CBigNum(unsigned int n)     { BN_init(this); setulong(n); }
-    //CBigNum(unsigned long n)    { BN_init(this); setulong(n); }
-    CBigNum(uint64_t n)           { BN_init(this); setuint64(n); }
+    CBigNum(signed char n)      :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(short n)            :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(int n)              :CBigNum() { if (n >= 0) setulong(n); else setint64(n); }
+    CBigNum(int64_t n)          :CBigNum() { setint64(n); }
+    CBigNum(unsigned char n)    :CBigNum() { setulong(n); }
+    CBigNum(unsigned short n)   :CBigNum() { setulong(n); }
+    CBigNum(unsigned int n)     :CBigNum() { setulong(n); }
+    CBigNum(uint64_t n)         :CBigNum() { setuint64(n); }
+
 
     explicit CBigNum(const std::vector<unsigned char>& vch)
+        : CBigNum()
     {
-        BN_init(this);
         setvch(vch);
     }
 
     void setulong(unsigned long n)
     {
-        if (!BN_set_word(this, n))
+        if (!BN_set_word(bn, n))
             throw bignum_error("CBigNum conversion from unsigned long : BN_set_word failed");
     }
 
     unsigned long getulong() const
     {
-        return BN_get_word(this);
+        return BN_get_word(bn);
     }
 
     unsigned int getuint() const
     {
-        return BN_get_word(this);
+        return BN_get_word(bn);
     }
 
     int getint() const
     {
-        unsigned long n = BN_get_word(this);
-        if (!BN_is_negative(this))
+        unsigned long n = BN_get_word(bn);
+        if (!BN_is_negative(bn))
             return (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::max() : n);
         else
             return (n > (unsigned long)std::numeric_limits<int>::max() ? std::numeric_limits<int>::min() : -(int)n);
@@ -171,7 +169,7 @@ class CBigNum : public BIGNUM
         pch[1] = (nSize >> 16) & 0xff;
         pch[2] = (nSize >> 8) & 0xff;
         pch[3] = (nSize) & 0xff;
-        BN_mpi2bn(pch, p - pch, this);
+        BN_mpi2bn(pch, p - pch, bn);
     }
 
     void setuint64(uint64_t n)
@@ -198,7 +196,7 @@ class CBigNum : public BIGNUM
         pch[1] = (nSize >> 16) & 0xff;
         pch[2] = (nSize >> 8) & 0xff;
         pch[3] = (nSize) & 0xff;
-        BN_mpi2bn(pch, p - pch, this);
+        BN_mpi2bn(pch, p - pch, bn);
     }
 
 
@@ -214,16 +212,16 @@ class CBigNum : public BIGNUM
         vch2[3] = (nSize >> 0) & 0xff;
         // swap data to big endian
         reverse_copy(vch.begin(), vch.end(), vch2.begin() + 4);
-        BN_mpi2bn(&vch2[0], vch2.size(), this);
+        BN_mpi2bn(&vch2[0], vch2.size(), bn);
     }
 
     std::vector<unsigned char> getvch() const
     {
-        unsigned int nSize = BN_bn2mpi(this, NULL);
+        unsigned int nSize = BN_bn2mpi(bn, NULL);
         if (nSize <= 4)
             return std::vector<unsigned char>();
         std::vector<unsigned char> vch(nSize);
-        BN_bn2mpi(this, &vch[0]);
+        BN_bn2mpi(bn, &vch[0]);
         vch.erase(vch.begin(), vch.begin() + 4);
         reverse(vch.begin(), vch.end());
         return vch;
@@ -237,16 +235,16 @@ class CBigNum : public BIGNUM
         if (nSize >= 1) vch[4] = (nCompact >> 16) & 0xff;
         if (nSize >= 2) vch[5] = (nCompact >> 8) & 0xff;
         if (nSize >= 3) vch[6] = (nCompact >> 0) & 0xff;
-        BN_mpi2bn(&vch[0], vch.size(), this);
+        BN_mpi2bn(&vch[0], vch.size(), bn);
         return *this;
     }
 
     unsigned int GetCompact() const
     {
-        unsigned int nSize = BN_bn2mpi(this, NULL);
+        unsigned int nSize = BN_bn2mpi(bn, NULL);
         std::vector<unsigned char> vch(nSize);
         nSize -= 4;
-        BN_bn2mpi(this, &vch[0]);
+        BN_bn2mpi(bn, &vch[0]);
         unsigned int nCompact = nSize << 24;
         if (nSize >= 1) nCompact |= (vch[4] << 16);
         if (nSize >= 2) nCompact |= (vch[5] << 8);
@@ -281,7 +279,7 @@ class CBigNum : public BIGNUM
             *this += n;
         }
         if (fNegative)
-            *this = 0 - *this;
+            BN_set_negative(bn, 1);
     }
 
     std::string ToString(int nBase=10) const
@@ -291,20 +289,20 @@ class CBigNum : public BIGNUM
         CBigNum bn0 = 0;
         std::string str;
         CBigNum bn = *this;
-        BN_set_negative(&bn, false);
+        BN_set_negative(bn.bn, false);
         CBigNum dv;
         CBigNum rem;
-        if (BN_cmp(&bn, &bn0) == 0)
+        if (BN_cmp(bn.bn, bn0.bn) == 0)
             return "0";
-        while (BN_cmp(&bn, &bn0) > 0)
+        while (BN_cmp(bn.bn, bn0.bn) > 0)
         {
-            if (!BN_div(&dv, &rem, &bn, &bnBase, pctx))
+            if (!BN_div(dv.bn, rem.bn, bn.bn, bnBase.bn, pctx))
                 throw bignum_error("CBigNum::ToString() : BN_div failed");
             bn = dv;
             unsigned int c = rem.getulong();
             str += "0123456789abcdef"[c];
         }
-        if (BN_is_negative(this))
+        if (BN_is_negative(this->bn))
             str += "-";
         reverse(str.begin(), str.end());
         return str;
@@ -319,45 +317,50 @@ class CBigNum : public BIGNUM
 
     bool operator!() const
     {
-        return BN_is_zero(this);
+        return BN_is_zero(bn);
     }
 
     CBigNum& operator+=(const CBigNum& b)
     {
-        if (!BN_add(this, this, &b))
+        if (!BN_add(bn, bn, b.bn))
             throw bignum_error("CBigNum::operator+= : BN_add failed");
         return *this;
     }
 
     CBigNum& operator-=(const CBigNum& b)
     {
-        *this = *this - b;
+        if (!BN_sub(bn, bn, b.bn))
+            throw bignum_error("CBigNum::operator-= : BN_sub failed");
         return *this;
     }
 
     CBigNum& operator*=(const CBigNum& b)
     {
         CAutoBN_CTX pctx;
-        if (!BN_mul(this, this, &b, pctx))
+            if (!BN_mul(bn, bn, b.bn, pctx))
             throw bignum_error("CBigNum::operator*= : BN_mul failed");
         return *this;
     }
 
     CBigNum& operator/=(const CBigNum& b)
     {
-        *this = *this / b;
+        CAutoBN_CTX pctx;
+        if (!BN_div(bn, NULL, bn, b.bn, pctx))
+            throw bignum_error("CBigNum::operator/= : BN_div failed");
         return *this;
     }
 
     CBigNum& operator%=(const CBigNum& b)
     {
-        *this = *this % b;
+        CAutoBN_CTX pctx;
+        if (!BN_div(NULL, bn, bn, b.bn, pctx))
+            throw bignum_error("CBigNum::operator%= : BN_div failed");
         return *this;
     }
 
     CBigNum& operator<<=(unsigned int shift)
     {
-        if (!BN_lshift(this, this, shift))
+        if (!BN_lshift(bn, bn, shift))
             throw bignum_error("CBigNum:operator<<= : BN_lshift failed");
         return *this;
     }
@@ -368,13 +371,13 @@ class CBigNum : public BIGNUM
         //   if built on ubuntu 9.04 or 9.10, probably depends on version of openssl
         CBigNum a = 1;
         a <<= shift;
-        if (BN_cmp(&a, this) > 0)
+        if (BN_cmp(a.bn, bn) > 0)
         {
             *this = 0;
             return *this;
         }
 
-        if (!BN_rshift(this, this, shift))
+        if (!BN_rshift(bn, bn, shift))
             throw bignum_error("CBigNum:operator>>= : BN_rshift failed");
         return *this;
     }
@@ -383,7 +386,7 @@ class CBigNum : public BIGNUM
     CBigNum& operator++()
     {
         // prefix operator
-        if (!BN_add(this, this, BN_value_one()))
+        if (!BN_add(bn, bn, BN_value_one()))
             throw bignum_error("CBigNum::operator++ : BN_add failed");
         return *this;
     }
@@ -400,7 +403,7 @@ class CBigNum : public BIGNUM
     {
         // prefix operator
         CBigNum r;
-        if (!BN_sub(&r, this, BN_value_one()))
+        if (!BN_sub(r.bn, bn, BN_value_one()))
             throw bignum_error("CBigNum::operator-- : BN_sub failed");
         *this = r;
         return *this;
@@ -414,10 +417,12 @@ class CBigNum : public BIGNUM
         return ret;
     }
 
-
-    friend inline const CBigNum operator-(const CBigNum& a, const CBigNum& b);
-    friend inline const CBigNum operator/(const CBigNum& a, const CBigNum& b);
-    friend inline const CBigNum operator%(const CBigNum& a, const CBigNum& b);
+    const BIGNUM* to_bignum() const {
+       return bn;
+    }
+    BIGNUM* to_bignum() {
+       return bn;
+    }
 };
 
 
@@ -425,7 +430,7 @@ class CBigNum : public BIGNUM
 inline const CBigNum operator+(const CBigNum& a, const CBigNum& b)
 {
     CBigNum r;
-    if (!BN_add(&r, &a, &b))
+    if (!BN_add(r.to_bignum(), a.to_bignum(), b.to_bignum()))
         throw bignum_error("CBigNum::operator+ : BN_add failed");
     return r;
 }
@@ -433,7 +438,7 @@ inline const CBigNum operator+(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator-(const CBigNum& a, const CBigNum& b)
 {
     CBigNum r;
-    if (!BN_sub(&r, &a, &b))
+    if (!BN_sub(r.to_bignum(), a.to_bignum(), b.to_bignum()))
         throw bignum_error("CBigNum::operator- : BN_sub failed");
     return r;
 }
@@ -441,7 +446,7 @@ inline const CBigNum operator-(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator-(const CBigNum& a)
 {
     CBigNum r(a);
-    BN_set_negative(&r, !BN_is_negative(&r));
+    BN_set_negative(r.to_bignum(), !BN_is_negative(r.to_bignum()));
     return r;
 }
 
@@ -449,7 +454,7 @@ inline const CBigNum operator*(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_mul(&r, &a, &b, pctx))
+    if (!BN_mul(r.to_bignum(), a.to_bignum(), b.to_bignum(), pctx))
         throw bignum_error("CBigNum::operator* : BN_mul failed");
     return r;
 }
@@ -458,7 +463,7 @@ inline const CBigNum operator/(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_div(&r, NULL, &a, &b, pctx))
+    if (!BN_div(r.to_bignum(), NULL, a.to_bignum(), b.to_bignum(), pctx))
         throw bignum_error("CBigNum::operator/ : BN_div failed");
     return r;
 }
@@ -467,7 +472,7 @@ inline const CBigNum operator%(const CBigNum& a, const CBigNum& b)
 {
     CAutoBN_CTX pctx;
     CBigNum r;
-    if (!BN_mod(&r, &a, &b, pctx))
+    if (!BN_mod(r.to_bignum(), a.to_bignum(), b.to_bignum(), pctx))
         throw bignum_error("CBigNum::operator% : BN_div failed");
     return r;
 }
@@ -475,7 +480,7 @@ inline const CBigNum operator%(const CBigNum& a, const CBigNum& b)
 inline const CBigNum operator<<(const CBigNum& a, unsigned int shift)
 {
     CBigNum r;
-    if (!BN_lshift(&r, &a, shift))
+    if (!BN_lshift(r.to_bignum(), a.to_bignum(), shift))
         throw bignum_error("CBigNum:operator<< : BN_lshift failed");
     return r;
 }
@@ -487,12 +492,12 @@ inline const CBigNum operator>>(const CBigNum& a, unsigned int shift)
     return r;
 }
 
-inline bool operator==(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) == 0); }
-inline bool operator!=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) != 0); }
-inline bool operator<=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) <= 0); }
-inline bool operator>=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(&a, &b) >= 0); }
-inline bool operator<(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(&a, &b) < 0); }
-inline bool operator>(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(&a, &b) > 0); }
+inline bool operator==(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) == 0); }
+inline bool operator!=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) != 0); }
+inline bool operator<=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) <= 0); }
+inline bool operator>=(const CBigNum& a, const CBigNum& b) { return (BN_cmp(a.to_bignum(), b.to_bignum()) >= 0); }
+inline bool operator<(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(a.to_bignum(), b.to_bignum()) < 0); }
+inline bool operator>(const CBigNum& a, const CBigNum& b)  { return (BN_cmp(a.to_bignum(), b.to_bignum()) > 0); }
 
 
 static const char* pszBase58 = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
@@ -522,7 +527,7 @@ inline std::string EncodeBase58(const unsigned char* pbegin, const unsigned char
     CBigNum rem;
     while (bn > bn0)
     {
-        if (!BN_div(&dv, &rem, &bn, &bn58, pctx))
+        if (!BN_div(dv.to_bignum(), rem.to_bignum(), bn.to_bignum(), bn58.to_bignum(), pctx))
             throw bignum_error("EncodeBase58 : BN_div failed");
         bn = dv;
         unsigned int c = rem.getulong();
@@ -572,7 +577,7 @@ inline bool DecodeBase58(const char* psz, std::vector<unsigned char>& vchRet)
             break;
         }
         bnChar.setulong(p1 - pszBase58);
-        if (!BN_mul(&bn, &bn, &bn58, pctx))
+        if (!BN_mul(bn.to_bignum(), bn.to_bignum(), bn58.to_bignum(), pctx))
             throw bignum_error("DecodeBase58 : BN_mul failed");
         bn += bnChar;
     }
diff --git a/src/crypto/base64.cpp b/src/crypto/base64.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/bigint.cpp b/src/crypto/bigint.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/blowfish.cpp b/src/crypto/blowfish.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/city.cpp b/src/crypto/city.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/crc.cpp b/src/crypto/crc.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/dh.cpp b/src/crypto/dh.cpp
old mode 100644
new mode 100755
index cbd7dcc..7e87437
--- a/src/crypto/dh.cpp
+++ b/src/crypto/dh.cpp
@@ -12,10 +12,19 @@ namespace fc {
 
    bool diffie_hellman::generate_params( int s, uint8_t g )
    {
-        ssl_dh dh = DH_generate_parameters( s, g, NULL, NULL );
+        ssl_dh dh(DH_new());
+        DH_generate_parameters_ex(dh.obj, s, g, NULL);
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        const BIGNUM* bn_p; // must not be free'd!
+        DH_get0_pqg(dh.obj, &bn_p, NULL, NULL);
+        p.resize( BN_num_bytes( bn_p ) );
+        if( p.size() )
+            BN_bn2bin( bn_p, (unsigned char*)&p.front()  );
+#else
         p.resize( BN_num_bytes( dh->p ) );
         if( p.size() )
             BN_bn2bin( dh->p, (unsigned char*)&p.front()  );
+#endif
         this->g = g;
         return fc::validate( dh, valid );
    }
@@ -25,8 +34,14 @@ namespace fc {
         if( !p.size() ) 
             return valid = false;
         ssl_dh dh = DH_new();
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        const auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
+        const auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
+#else        
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+#endif        
         return fc::validate( dh, valid );
    }
 
@@ -35,8 +50,14 @@ namespace fc {
         if( !p.size() ) 
             return valid = false;
         ssl_dh dh = DH_new();
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        const auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
+        const auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
+#else        
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+#endif
 
         if( !fc::validate( dh, valid ) )
         {
@@ -44,21 +65,42 @@ namespace fc {
         }
         DH_generate_key(dh);
 
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        const BIGNUM* bn_pub_key; // must not be free'd!
+        const BIGNUM* bn_priv_key; // must not be free'd!
+        DH_get0_key(dh.obj, &bn_pub_key, &bn_priv_key);
+        pub_key.resize( BN_num_bytes( bn_pub_key ) );
+        priv_key.resize( BN_num_bytes( bn_priv_key ) );
+        if( pub_key.size() )
+            BN_bn2bin( bn_pub_key, (unsigned char*)&pub_key.front()  );
+        if( priv_key.size() )
+            BN_bn2bin( bn_priv_key, (unsigned char*)&priv_key.front()  );
+#else
         pub_key.resize( BN_num_bytes( dh->pub_key ) );
         priv_key.resize( BN_num_bytes( dh->priv_key ) );
         if( pub_key.size() )
             BN_bn2bin( dh->pub_key, (unsigned char*)&pub_key.front()  );
         if( priv_key.size() )
             BN_bn2bin( dh->priv_key, (unsigned char*)&priv_key.front()  );
+#endif
 
         return true;
    }
    bool diffie_hellman::compute_shared_key( const char* buf, uint32_t s ) {
         ssl_dh dh = DH_new();
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+        auto bn_p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
+        auto bn_pub_key = BN_bin2bn( (unsigned char*)&pub_key.front(), pub_key.size(), NULL );
+        auto bn_priv_key = BN_bin2bn( (unsigned char*)&priv_key.front(), priv_key.size(), NULL );
+        auto bn_g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+        DH_set0_pqg(dh.obj, bn_p, NULL, bn_g);
+        DH_set0_key(dh.obj, bn_pub_key, bn_priv_key);
+#else        
         dh->p = BN_bin2bn( (unsigned char*)&p.front(), p.size(), NULL );
         dh->pub_key = BN_bin2bn( (unsigned char*)&pub_key.front(), pub_key.size(), NULL );
         dh->priv_key = BN_bin2bn( (unsigned char*)&priv_key.front(), priv_key.size(), NULL );
         dh->g = BN_bin2bn( (unsigned char*)&g, 1, NULL );
+#endif
 
         int check;
         DH_check(dh,&check);
diff --git a/src/crypto/elliptic_common.cpp b/src/crypto/elliptic_common.cpp
old mode 100644
new mode 100755
index 66b75d0..16a57cb
--- a/src/crypto/elliptic_common.cpp
+++ b/src/crypto/elliptic_common.cpp
@@ -231,11 +231,12 @@ namespace fc { namespace ecc {
 
     static fc::string _to_base58( const extended_key_data& key )
     {
-        char *buffer = (char*)alloca(key.size() + 4);
+        size_t buf_len = key.size() + 4;
+        char *buffer = (char*)alloca(buf_len);
         memcpy( buffer, key.begin(), key.size() );
         fc::sha256 double_hash = fc::sha256::hash( fc::sha256::hash( key.begin(), key.size() ));
         memcpy( buffer + key.size(), double_hash.data(), 4 );
-        return fc::to_base58( buffer, sizeof(buffer) );
+        return fc::to_base58( buffer, buf_len );
     }
 
     static void _parse_extended_data( unsigned char* buffer, fc::string base58 )
@@ -301,9 +302,6 @@ namespace fc { namespace ecc {
         return extended_public_key( get_public_key(), c, child_num, parent_fp, depth );
     }
 
-    public_key extended_public_key::generate_p(int i) const { return derive_normal_child(2*i + 0); }
-    public_key extended_public_key::generate_q(int i) const { return derive_normal_child(2*i + 1); }
-
     extended_private_key extended_private_key::derive_child(int i) const
     {
         return i < 0 ? derive_hardened_child(i) : derive_normal_child(i);
@@ -346,11 +344,6 @@ namespace fc { namespace ecc {
        return from_base58( _to_base58( data ) );
     }
 
-    private_key extended_private_key::generate_a(int i) const { return derive_hardened_child(4*i + 0); }
-    private_key extended_private_key::generate_b(int i) const { return derive_hardened_child(4*i + 1); }
-    private_key extended_private_key::generate_c(int i) const { return derive_hardened_child(4*i + 2); }
-    private_key extended_private_key::generate_d(int i) const { return derive_hardened_child(4*i + 3); }
-
     fc::string extended_private_key::str() const
     {
         return _to_base58( serialize_extended() );
diff --git a/src/crypto/elliptic_impl_priv.cpp b/src/crypto/elliptic_impl_priv.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/elliptic_impl_pub.cpp b/src/crypto/elliptic_impl_pub.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/elliptic_mixed.cpp b/src/crypto/elliptic_mixed.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/elliptic_openssl.cpp b/src/crypto/elliptic_openssl.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/elliptic_secp256k1.cpp b/src/crypto/elliptic_secp256k1.cpp
old mode 100644
new mode 100755
index 91edc18..515d086
--- a/src/crypto/elliptic_secp256k1.cpp
+++ b/src/crypto/elliptic_secp256k1.cpp
@@ -185,164 +185,6 @@ namespace fc { namespace ecc {
         return result;
     }
 
-    static void to_bignum( const unsigned char* in, ssl_bignum& out, unsigned int len )
-    {
-        if ( *in & 0x80 )
-        {
-            unsigned char *buffer = (unsigned char*)alloca(len + 1);
-            *buffer = 0;
-            memcpy( buffer + 1, in, len );
-            BN_bin2bn( buffer, sizeof(buffer), out );
-        }
-        else
-        {
-            BN_bin2bn( in, len, out );
-        }
-    }
-
-    static void to_bignum( const private_key_secret& in, ssl_bignum& out )
-    {
-        to_bignum( (unsigned char*) in.data(), out, in.data_size() );
-    }
-
-    static void from_bignum( const ssl_bignum& in, unsigned char* out, unsigned int len )
-    {
-        unsigned int l = BN_num_bytes( in );
-        if ( l > len )
-        {
-            unsigned char *buffer = (unsigned char*)alloca(l);
-            BN_bn2bin( in, buffer );
-            memcpy( out, buffer + l - len, len );
-        }
-        else
-        {
-            memset( out, 0, len - l );
-            BN_bn2bin( in, out + len - l );
-        }
-    }
-
-    static void from_bignum( const ssl_bignum& in, private_key_secret& out )
-    {
-        from_bignum( in, (unsigned char*) out.data(), out.data_size() );
-    }
-
-    static void invert( const private_key_secret& in, private_key_secret& out )
-    {
-        ssl_bignum bn_in;
-        to_bignum( in, bn_in );
-        ssl_bignum bn_n;
-        to_bignum( detail::get_curve_order(), bn_n );
-        ssl_bignum bn_inv;
-        bn_ctx ctx( BN_CTX_new() );
-        FC_ASSERT( BN_mod_inverse( bn_inv, bn_in, bn_n, ctx ) );
-        from_bignum( bn_inv, out );
-    }
-
-    static void to_point( const public_key_data& in, ec_point& out )
-    {
-        bn_ctx ctx( BN_CTX_new() );
-        const ec_group& curve = detail::get_curve();
-        private_key_secret x;
-        memcpy( x.data(), in.begin() + 1, x.data_size() );
-        ssl_bignum bn_x;
-        to_bignum( x, bn_x );
-        FC_ASSERT( EC_POINT_set_compressed_coordinates_GFp( curve, out, bn_x, *in.begin() & 1, ctx ) > 0 );
-    }
-
-    static void from_point( const ec_point& in, public_key_data& out )
-    {
-        bn_ctx ctx( BN_CTX_new() );
-        const ec_group& curve = detail::get_curve();
-        ssl_bignum bn_x;
-        ssl_bignum bn_y;
-        FC_ASSERT( EC_POINT_get_affine_coordinates_GFp( curve, in, bn_x, bn_y, ctx ) > 0 );
-        private_key_secret x;
-        from_bignum( bn_x, x );
-        memcpy( out.begin() + 1, x.data(), out.size() - 1 );
-        *out.begin() = BN_is_bit_set( bn_y, 0 ) ? 3 : 2;
-    }
-
-//    static void print(const unsigned char* data) {
-//        for (int i = 0; i < 32; i++) {
-//            printf("%02x", *data++);
-//        }
-//    }
-//
-//    static void print(private_key_secret key) {
-//        print((unsigned char*) key.data());
-//    }
-//
-//    static void print(public_key_data key) {
-//        print((unsigned char*) key.begin() + 1);
-//    }
-
-    static void canonicalize( unsigned char *int256 )
-    {
-        fc::sha256 biggi( (char*) int256, 32 );
-        if ( detail::get_half_curve_order() >= biggi )
-        {
-            return; // nothing to do
-        }
-        ssl_bignum bn_k;
-        to_bignum( int256, bn_k, 32 );
-        ssl_bignum bn_n;
-        to_bignum( detail::get_curve_order(), bn_n );
-        FC_ASSERT( BN_sub( bn_k, bn_n, bn_k ) );
-        from_bignum( bn_k, int256, 32 );
-    }
-
-    static public_key compute_k( const private_key_secret& a, const private_key_secret& c,
-                                 const public_key& p )
-    {
-        private_key_secret prod = a;
-        FC_ASSERT( secp256k1_ec_privkey_tweak_mul( detail::_get_context(), (unsigned char*) prod.data(), (unsigned char*) c.data() ) > 0 );
-        invert( prod, prod );
-        public_key_data P = p.serialize();
-        FC_ASSERT( secp256k1_ec_pubkey_tweak_mul( detail::_get_context(), (unsigned char*) P.begin(), P.size(), (unsigned char*) prod.data() ) );
-//        printf("K: "); print(P); printf("\n");
-        return public_key( P );
-    }
-
-    static public_key compute_t( const private_key_secret& a, const private_key_secret& b,
-                                 const private_key_secret& c, const private_key_secret& d,
-                                 const public_key_data& p, const public_key_data& q )
-    {
-        private_key_secret prod;
-        invert( c, prod ); // prod == c^-1
-        FC_ASSERT( secp256k1_ec_privkey_tweak_mul( detail::_get_context(), (unsigned char*) prod.data(), (unsigned char*) d.data() ) > 0 );
-        // prod == c^-1 * d
-
-        public_key_data accu = p;
-        FC_ASSERT( secp256k1_ec_pubkey_tweak_mul( detail::_get_context(), (unsigned char*) accu.begin(), accu.size(), (unsigned char*) prod.data() ) );
-        // accu == prod * P == c^-1 * d * P
-
-        ec_point point_accu( EC_POINT_new( detail::get_curve() ) );
-        to_point( accu, point_accu );
-        ec_point point_q( EC_POINT_new( detail::get_curve() ) );
-        to_point( q, point_q );
-        bn_ctx ctx(BN_CTX_new());
-        FC_ASSERT( EC_POINT_add( detail::get_curve(), point_accu, point_accu, point_q, ctx ) > 0 );
-        from_point( point_accu, accu );
-        // accu == c^-1 * a * P + Q
-
-        FC_ASSERT( secp256k1_ec_pubkey_tweak_add( detail::_get_context(), (unsigned char*) accu.begin(), accu.size(), (unsigned char*) b.data() ) );
-        // accu == c^-1 * a * P + Q + b*G
-
-        public_key_data k = compute_k( a, c, p ).serialize();
-        memcpy( prod.data(), k.begin() + 1, prod.data_size() );
-        // prod == Kx
-        FC_ASSERT( secp256k1_ec_privkey_tweak_mul( detail::_get_context(), (unsigned char*) prod.data(), (unsigned char*) a.data() ) > 0 );
-        // prod == Kx * a
-        invert( prod, prod );
-        // prod == (Kx * a)^-1
-
-        FC_ASSERT( secp256k1_ec_pubkey_tweak_mul( detail::_get_context(), (unsigned char*) accu.begin(), accu.size(), (unsigned char*) prod.data() ) );
-        // accu == (c^-1 * a * P + Q + b*G) * (Kx * a)^-1
-
-//        printf("T: "); print(accu); printf("\n");
-        return public_key( accu );
-    }
-
     extended_private_key::extended_private_key( const private_key& k, const sha256& c,
                                                 int child, int parent, uint8_t depth )
         : private_key(k), c(c), child_num(child), parent_fp(parent), depth(depth) { }
@@ -358,102 +200,6 @@ namespace fc { namespace ecc {
         return result;
     }
 
-    public_key extended_private_key::blind_public_key( const extended_public_key& bob, int i ) const
-    {
-        private_key_secret a = generate_a(i).get_secret();
-        private_key_secret b = generate_b(i).get_secret();
-        private_key_secret c = generate_c(i).get_secret();
-        private_key_secret d = generate_d(i).get_secret();
-        public_key_data p = bob.generate_p(i).serialize();
-        public_key_data q = bob.generate_q(i).serialize();
-//        printf("a: "); print(a); printf("\n");
-//        printf("b: "); print(b); printf("\n");
-//        printf("c: "); print(c); printf("\n");
-//        printf("d: "); print(d); printf("\n");
-//        printf("P: "); print(p); printf("\n");
-//        printf("Q: "); print(q); printf("\n");
-        return compute_t( a, b, c, d, p, q );
-    }
-
-    blinded_hash extended_private_key::blind_hash( const fc::sha256& hash, int i ) const
-    {
-        private_key_secret a = generate_a(i).get_secret();
-        private_key_secret b = generate_b(i).get_secret();
-        FC_ASSERT( secp256k1_ec_privkey_tweak_mul( detail::_get_context(), (unsigned char*) a.data(), (unsigned char*) hash.data() ) > 0 );
-        FC_ASSERT( secp256k1_ec_privkey_tweak_add( detail::_get_context(), (unsigned char*) a.data(), (unsigned char*) b.data() ) > 0 );
-//        printf("hash: "); print(hash); printf("\n");
-//        printf("blinded: "); print(a); printf("\n");
-        return a;
-    }
-
-    private_key_secret extended_private_key::compute_p( int i ) const
-    {
-        private_key_secret p_inv = derive_normal_child( 2*i ).get_secret();
-        invert( p_inv, p_inv );
-//        printf("p: "); print(p_inv); printf("\n");
-        return p_inv;
-    }
-
-    private_key_secret extended_private_key::compute_q( int i, const private_key_secret& p ) const
-    {
-        private_key_secret q = derive_normal_child( 2*i + 1 ).get_secret();
-        FC_ASSERT( secp256k1_ec_privkey_tweak_mul( detail::_get_context(), (unsigned char*) q.data(), (unsigned char*) p.data() ) > 0 );
-//        printf("q: "); print(q); printf("\n");
-        return q;
-    }
-
-    blind_signature extended_private_key::blind_sign( const blinded_hash& hash, int i ) const
-    {
-        private_key_secret p = compute_p( i );
-        private_key_secret q = compute_q( i, p );
-        FC_ASSERT( secp256k1_ec_privkey_tweak_mul( detail::_get_context(), (unsigned char*) p.data(), (unsigned char*) hash.data() ) > 0 );
-        FC_ASSERT( secp256k1_ec_privkey_tweak_add( detail::_get_context(), (unsigned char*) p.data(), (unsigned char*) q.data() ) > 0 );
-//        printf("blind_sig: "); print(p); printf("\n");
-        return p;
-    }
-
-    compact_signature extended_private_key::unblind_signature( const extended_public_key& bob,
-                                                               const blind_signature& sig,
-                                                               const fc::sha256& hash,
-                                                               int i ) const
-    {
-        private_key_secret a = generate_a(i).get_secret();
-        private_key_secret b = generate_b(i).get_secret();
-        private_key_secret c = generate_c(i).get_secret();
-        private_key_secret d = generate_d(i).get_secret();
-        public_key p = bob.generate_p(i);
-        public_key q = bob.generate_q(i);
-        public_key_data k = compute_k( a, c, p );
-        public_key_data t = compute_t( a, b, c, d, p, q ).serialize();
-
-        FC_ASSERT( secp256k1_ec_privkey_tweak_mul( detail::_get_context(), (unsigned char*) c.data(), (unsigned char*) sig.data() ) > 0 );
-        FC_ASSERT( secp256k1_ec_privkey_tweak_add( detail::_get_context(), (unsigned char*) c.data(), (unsigned char*) d.data() ) > 0 );
-
-        compact_signature result;
-        memcpy( result.begin() + 1, k.begin() + 1, 32 );
-        memcpy( result.begin() + 33, c.data(), 32 );
-        canonicalize( result.begin() + 33 );
-//        printf("unblinded: "); print(result.begin() + 33); printf("\n");
-        for ( int i = 0; i < 4; i++ )
-        {
-            unsigned char pubkey[33];
-            int pklen = 33;
-            if ( secp256k1_ecdsa_recover_compact( detail::_get_context(), (unsigned char*) hash.data(),
-                                                  (unsigned char*) result.begin() + 1,
-                                                  pubkey, &pklen, 1, i ) )
-            {
-                if ( !memcmp( t.begin(), pubkey, sizeof(pubkey) ) )
-                {
-                    *result.begin() = 27 + 4 + i;
-                    return result;
-//                } else {
-//                    printf("Candidate: "); print( pubkey ); printf("\n");
-                }
-            }
-        }
-        FC_ASSERT( 0, "Failed to unblind - use different i" );
-    }
-
      commitment_type blind( const blind_factor_type& blind, uint64_t value )
      {
         commitment_type result;
diff --git a/src/crypto/hex.cpp b/src/crypto/hex.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/md5.cpp b/src/crypto/md5.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/openssl.cpp b/src/crypto/openssl.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/pke.cpp b/src/crypto/pke.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/rand.cpp b/src/crypto/rand.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/ripemd160.cpp b/src/crypto/ripemd160.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/sha1.cpp b/src/crypto/sha1.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/sha224.cpp b/src/crypto/sha224.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/sha256.cpp b/src/crypto/sha256.cpp
old mode 100644
new mode 100755
diff --git a/src/crypto/sha512.cpp b/src/crypto/sha512.cpp
old mode 100644
new mode 100755
diff --git a/src/exception.cpp b/src/exception.cpp
old mode 100644
new mode 100755
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
old mode 100644
new mode 100755
index a7151c5..3046d56
--- a/src/filesystem.cpp
+++ b/src/filesystem.cpp
@@ -245,10 +245,16 @@ namespace fc {
   void remove_all( const path& p ) { boost::filesystem::remove_all(p); }
   void copy( const path& f, const path& t ) { 
      try {
-  	    boost::filesystem::copy( boost::filesystem::path(f), boost::filesystem::path(t) ); 
+          boost::system::error_code ec;
+          boost::filesystem::copy( boost::filesystem::path(f), boost::filesystem::path(t), ec );
+          if( ec )
+          {
+            FC_THROW( "Copy from ${srcfile} to ${dstfile} failed because ${code} : ${message}",
+                      ("srcfile",f)("dstfile",t)("code",ec.value())("message",ec.message()) );
+          }    
      } catch ( boost::system::system_error& e ) {
      	FC_THROW( "Copy from ${srcfile} to ${dstfile} failed because ${reason}",
-	         ("srcfile",f)("dstfile",t)("reason",e.what() ) );
+	         	    ("srcfile",f)("dstfile",t)("reason",std::string(e.what()) ) );
      } catch ( ... ) {
      	FC_THROW( "Copy from ${srcfile} to ${dstfile} failed",
 	         ("srcfile",f)("dstfile",t)("inner", fc::except_str() ) );
@@ -262,7 +268,7 @@ namespace fc {
     catch ( boost::system::system_error& e )
     {
       FC_THROW( "Resize file '${f}' to size ${s} failed: ${reason}",
-                ("f",f)("s",t)( "reason", e.what() ) );
+                ("f",f)("s",t)( "reason", std::string(e.what()) ) );
     } 
     catch ( ... ) 
     {
@@ -301,13 +307,14 @@ namespace fc {
   void rename( const path& f, const path& t ) { 
      try {
   	    boost::filesystem::rename( boost::filesystem::path(f), boost::filesystem::path(t) ); 
-     } catch ( boost::system::system_error& ) {
-         try{
-             boost::filesystem::copy( boost::filesystem::path(f), boost::filesystem::path(t) ); 
-             boost::filesystem::remove( boost::filesystem::path(f)); 
-         } catch ( boost::system::system_error& e ) {
-             FC_THROW( "Rename from ${srcfile} to ${dstfile} failed because ${reason}",
-                     ("srcfile",f)("dstfile",t)("reason",e.what() ) );
+     } catch ( boost::system::system_error& er ) {
+         try {
+            copy( f, t );
+            remove( f );
+         } catch ( fc::exception& e ) {
+             FC_RETHROW_EXCEPTION( e, error,
+                  "Rename from ${srcfile} to ${dstfile} failed due to ${reason}, trying to copy then remove",
+                  ("srcfile",f)("dstfile",t)("reason",std::string(er.what())) );
          }
      } catch ( ... ) {
      	FC_THROW( "Rename from ${srcfile} to ${dstfile} failed",
diff --git a/src/git_revision.cpp.in b/src/git_revision.cpp.in
old mode 100644
new mode 100755
diff --git a/src/interprocess/file_mapping.cpp b/src/interprocess/file_mapping.cpp
old mode 100644
new mode 100755
diff --git a/src/interprocess/file_mutex.cpp b/src/interprocess/file_mutex.cpp
old mode 100644
new mode 100755
diff --git a/src/interprocess/mmap_struct.cpp b/src/interprocess/mmap_struct.cpp
old mode 100644
new mode 100755
diff --git a/src/interprocess/process.cpp b/src/interprocess/process.cpp
old mode 100644
new mode 100755
diff --git a/src/interprocess/signals.cpp b/src/interprocess/signals.cpp
old mode 100644
new mode 100755
diff --git a/src/io/buffered_iostream.cpp b/src/io/buffered_iostream.cpp
old mode 100644
new mode 100755
diff --git a/src/io/console.cpp b/src/io/console.cpp
old mode 100644
new mode 100755
diff --git a/src/io/datastream.cpp b/src/io/datastream.cpp
old mode 100644
new mode 100755
diff --git a/src/io/fstream.cpp b/src/io/fstream.cpp
old mode 100644
new mode 100755
diff --git a/src/io/iostream.cpp b/src/io/iostream.cpp
old mode 100644
new mode 100755
diff --git a/src/io/json.cpp b/src/io/json.cpp
old mode 100644
new mode 100755
diff --git a/src/io/sstream.cpp b/src/io/sstream.cpp
old mode 100644
new mode 100755
diff --git a/src/io/varint.cpp b/src/io/varint.cpp
old mode 100644
new mode 100755
diff --git a/src/log/appender.cpp b/src/log/appender.cpp
old mode 100644
new mode 100755
diff --git a/src/log/console_appender.cpp b/src/log/console_appender.cpp
old mode 100644
new mode 100755
diff --git a/src/log/console_defines.h b/src/log/console_defines.h
old mode 100644
new mode 100755
diff --git a/src/log/file_appender.cpp b/src/log/file_appender.cpp
old mode 100644
new mode 100755
index 204686a..dabdf3f
--- a/src/log/file_appender.cpp
+++ b/src/log/file_appender.cpp
@@ -12,6 +12,7 @@
 #include <iomanip>
 #include <queue>
 #include <sstream>
+#include <iostream>
 
 namespace fc {
 
diff --git a/src/log/gelf_appender.cpp b/src/log/gelf_appender.cpp
old mode 100644
new mode 100755
diff --git a/src/log/log_message.cpp b/src/log/log_message.cpp
old mode 100644
new mode 100755
diff --git a/src/log/logger.cpp b/src/log/logger.cpp
old mode 100644
new mode 100755
diff --git a/src/log/logger_config.cpp b/src/log/logger_config.cpp
old mode 100644
new mode 100755
diff --git a/src/network/http/http_connection.cpp b/src/network/http/http_connection.cpp
old mode 100644
new mode 100755
diff --git a/src/network/http/http_server.cpp b/src/network/http/http_server.cpp
old mode 100644
new mode 100755
diff --git a/src/network/http/websocket.cpp b/src/network/http/websocket.cpp
old mode 100644
new mode 100755
diff --git a/src/network/ip.cpp b/src/network/ip.cpp
old mode 100644
new mode 100755
diff --git a/src/network/ntp.cpp b/src/network/ntp.cpp
old mode 100644
new mode 100755
diff --git a/src/network/rate_limiting.cpp b/src/network/rate_limiting.cpp
old mode 100644
new mode 100755
diff --git a/src/network/resolve.cpp b/src/network/resolve.cpp
old mode 100644
new mode 100755
diff --git a/src/network/tcp_socket.cpp b/src/network/tcp_socket.cpp
old mode 100644
new mode 100755
index 1c980fc..b40f496
--- a/src/network/tcp_socket.cpp
+++ b/src/network/tcp_socket.cpp
@@ -177,13 +177,13 @@ namespace fc {
       keepalive_settings.keepaliveinterval = (ULONG)(interval.count() / fc::milliseconds(1).count());
 
       DWORD dwBytesRet = 0;
-      if (WSAIoctl(my->_sock.native(), SIO_KEEPALIVE_VALS, &keepalive_settings, sizeof(keepalive_settings),
+      if (WSAIoctl(my->_sock.native_handle(), SIO_KEEPALIVE_VALS, &keepalive_settings, sizeof(keepalive_settings),
                    NULL, 0, &dwBytesRet, NULL, NULL) == SOCKET_ERROR)
         wlog("Error setting TCP keepalive values");
 #elif !defined(__clang__) || (__clang_major__ >= 6)
       // This should work for modern Linuxes and for OSX >= Mountain Lion
       int timeout_sec = interval.count() / fc::seconds(1).count();
-      if (setsockopt(my->_sock.native(), IPPROTO_TCP, 
+      if (setsockopt(my->_sock.native_handle(), IPPROTO_TCP,
       #if defined( __APPLE__ )
                      TCP_KEEPALIVE,
        #else
@@ -192,7 +192,7 @@ namespace fc {
                      (char*)&timeout_sec, sizeof(timeout_sec)) < 0)
         wlog("Error setting TCP keepalive idle time");
 # if !defined(__APPLE__) || defined(TCP_KEEPINTVL) // TCP_KEEPINTVL not defined before 10.9
-      if (setsockopt(my->_sock.native(), IPPROTO_TCP, TCP_KEEPINTVL, 
+      if (setsockopt(my->_sock.native_handle(), IPPROTO_TCP, TCP_KEEPINTVL,
                      (char*)&timeout_sec, sizeof(timeout_sec)) < 0)
         wlog("Error setting TCP keepalive interval");
 # endif // !__APPLE__ || TCP_KEEPINTVL
@@ -224,7 +224,7 @@ namespace fc {
     if (detail::have_so_reuseport)
     {
       int reuseport_value = 1;
-      if (setsockopt(my->_sock.native(), SOL_SOCKET, SO_REUSEPORT, 
+      if (setsockopt(my->_sock.native_handle(), SOL_SOCKET, SO_REUSEPORT,
                      (char*)&reuseport_value, sizeof(reuseport_value)) < 0)
       {
         if (errno == ENOPROTOOPT)
@@ -291,7 +291,7 @@ namespace fc {
     if (detail::have_so_reuseport)
     {
       int reuseport_value = 1;
-      if (setsockopt(my->_accept.native(), SOL_SOCKET, SO_REUSEPORT, 
+      if (setsockopt(my->_accept.native_handle(), SOL_SOCKET, SO_REUSEPORT,
                      (char*)&reuseport_value, sizeof(reuseport_value)) < 0)
       {
         if (errno == ENOPROTOOPT)
diff --git a/src/network/udp_socket.cpp b/src/network/udp_socket.cpp
old mode 100644
new mode 100755
diff --git a/src/network/url.cpp b/src/network/url.cpp
old mode 100644
new mode 100755
diff --git a/src/real128.cpp b/src/real128.cpp
old mode 100644
new mode 100755
diff --git a/src/rpc/bstate.cpp b/src/rpc/bstate.cpp
old mode 100644
new mode 100755
diff --git a/src/rpc/cli.cpp b/src/rpc/cli.cpp
old mode 100644
new mode 100755
diff --git a/src/rpc/http_api.cpp b/src/rpc/http_api.cpp
old mode 100644
new mode 100755
diff --git a/src/rpc/json_connection.cpp b/src/rpc/json_connection.cpp
old mode 100644
new mode 100755
diff --git a/src/rpc/state.cpp b/src/rpc/state.cpp
old mode 100644
new mode 100755
diff --git a/src/rpc/websocket_api.cpp b/src/rpc/websocket_api.cpp
old mode 100644
new mode 100755
diff --git a/src/shared_ptr.cpp b/src/shared_ptr.cpp
old mode 100644
new mode 100755
diff --git a/src/string.cpp b/src/string.cpp
old mode 100644
new mode 100755
diff --git a/src/thread/context.hpp b/src/thread/context.hpp
old mode 100644
new mode 100755
index f6e8a77..18a060c
--- a/src/thread/context.hpp
+++ b/src/thread/context.hpp
@@ -6,7 +6,15 @@
 
 #include <boost/version.hpp>
 
-#if BOOST_VERSION >= 105400
+#define BOOST_COROUTINES_NO_DEPRECATION_WARNING // Boost 1.61
+#define BOOST_COROUTINE_NO_DEPRECATION_WARNING // Boost 1.62
+
+#if BOOST_VERSION >= 106100
+  #include <boost/coroutine/stack_allocator.hpp>
+  namespace bc  = boost::context::detail;
+  namespace bco = boost::coroutines;
+  typedef bco::stack_allocator stack_allocator;
+#elif BOOST_VERSION >= 105400
 # include <boost/coroutine/stack_context.hpp>
   namespace bc  = boost::context;
   namespace bco = boost::coroutines;
@@ -47,8 +55,13 @@ namespace fc {
     bco::stack_context stack_ctx;
 #endif
 
+#if BOOST_VERSION >= 106100
+    using context_fn = void (*)(bc::transfer_t);
+#else
+    using context_fn = void(*)(intptr_t);
+#endif
 
-    context( void (*sf)(intptr_t), stack_allocator& alloc, fc::thread* t )
+    context( context_fn sf, stack_allocator& alloc, fc::thread* t )
     : caller_context(0),
       stack_alloc(&alloc),
       next_blocked(0), 
diff --git a/src/thread/future.cpp b/src/thread/future.cpp
old mode 100644
new mode 100755
diff --git a/src/thread/mutex.cpp b/src/thread/mutex.cpp
old mode 100644
new mode 100755
diff --git a/src/thread/non_preemptable_scope_check.cpp b/src/thread/non_preemptable_scope_check.cpp
old mode 100644
new mode 100755
diff --git a/src/thread/spin_lock.cpp b/src/thread/spin_lock.cpp
old mode 100644
new mode 100755
diff --git a/src/thread/spin_yield_lock.cpp b/src/thread/spin_yield_lock.cpp
old mode 100644
new mode 100755
diff --git a/src/thread/task.cpp b/src/thread/task.cpp
old mode 100644
new mode 100755
diff --git a/src/thread/thread.cpp b/src/thread/thread.cpp
old mode 100644
new mode 100755
diff --git a/src/thread/thread_d.hpp b/src/thread/thread_d.hpp
old mode 100644
new mode 100755
index 941b2fa..74b59d3
--- a/src/thread/thread_d.hpp
+++ b/src/thread/thread_d.hpp
@@ -18,6 +18,7 @@ namespace fc {
     class thread_d {
 
         public:
+          using context_pair = std::pair<thread_d*, fc::context*>;
            thread_d(fc::thread& s)
             :self(s), boost_thread(0),
              task_in_queue(0),
@@ -397,7 +398,11 @@ namespace fc {
                 }
                 // slog( "jump to %p from %p", next, prev );
                 // fc_dlog( logger::get("fc_context"), "from ${from} to ${to}", ( "from", int64_t(prev) )( "to", int64_t(next) ) ); 
-#if BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 106100
+                auto p = context_pair{nullptr, prev};
+                auto t = bc::jump_fcontext( next->my_context, &p );
+                static_cast<context_pair*>(t.data)->second->my_context = t.fctx;
+#elif BOOST_VERSION >= 105600
                 bc::jump_fcontext( &prev->my_context, next->my_context, 0 );
 #elif BOOST_VERSION >= 105300
                 bc::jump_fcontext( prev->my_context, next->my_context, 0 );
@@ -439,7 +444,11 @@ namespace fc {
 
                 // slog( "jump to %p from %p", next, prev );
                 // fc_dlog( logger::get("fc_context"), "from ${from} to ${to}", ( "from", int64_t(prev) )( "to", int64_t(next) ) );
-#if BOOST_VERSION >= 105600
+#if BOOST_VERSION >= 106100
+                auto p = context_pair{this, prev};
+                auto t = bc::jump_fcontext( next->my_context, &p );
+                static_cast<context_pair*>(t.data)->second->my_context = t.fctx;
+#elif BOOST_VERSION >= 105600
                 bc::jump_fcontext( &prev->my_context, next->my_context, (intptr_t)this );
 #elif BOOST_VERSION >= 105300
                 bc::jump_fcontext( prev->my_context, next->my_context, (intptr_t)this );
@@ -467,9 +476,17 @@ namespace fc {
               return true;
            }
 
+#if BOOST_VERSION >= 106100
+           static void start_process_tasks( bc::transfer_t my )
+           {
+              auto p = static_cast<context_pair*>(my.data); 
+              auto self = static_cast<thread_d*>(p->first);
+              p->second->my_context = my.fctx;
+#else
            static void start_process_tasks( intptr_t my ) 
            {
               thread_d* self = (thread_d*)my;
+#endif              
               try 
               {
                 self->process_tasks();
diff --git a/src/thread/thread_specific.cpp b/src/thread/thread_specific.cpp
old mode 100644
new mode 100755
diff --git a/src/time.cpp b/src/time.cpp
old mode 100644
new mode 100755
diff --git a/src/uint128.cpp b/src/uint128.cpp
old mode 100644
new mode 100755
diff --git a/src/utf8.cpp b/src/utf8.cpp
old mode 100644
new mode 100755
diff --git a/src/utf8/ReleaseNotes b/src/utf8/ReleaseNotes
old mode 100644
new mode 100755
diff --git a/src/utf8/checked.h b/src/utf8/checked.h
old mode 100644
new mode 100755
diff --git a/src/utf8/core.h b/src/utf8/core.h
old mode 100644
new mode 100755
diff --git a/src/utf8/unchecked.h b/src/utf8/unchecked.h
old mode 100644
new mode 100755
diff --git a/src/utf8/utf8cpp.html b/src/utf8/utf8cpp.html
old mode 100644
new mode 100755
diff --git a/src/variant.cpp b/src/variant.cpp
old mode 100644
new mode 100755
diff --git a/src/variant_object.cpp b/src/variant_object.cpp
old mode 100644
new mode 100755
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
old mode 100644
new mode 100755
index 1043e50..c3f125d
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -23,9 +23,6 @@ target_link_libraries( real128_test fc )
 add_executable( hmac_test hmac_test.cpp )
 target_link_libraries( hmac_test fc )
 
-add_executable( blinding_test blinding_test.cpp )
-target_link_libraries( blinding_test fc )
-
 add_executable( ecc_test crypto/ecc_test.cpp )
 target_link_libraries( ecc_test fc )
 
@@ -51,6 +48,7 @@ add_executable( all_tests all_tests.cpp
                           crypto/sha_tests.cpp
                           network/http/websocket_test.cpp
                           thread/task_cancel.cpp
+                          thread/thread_tests.cpp
                           bloom_test.cpp
                           real128_test.cpp
                           utf8_test.cpp
diff --git a/tests/all_tests.cpp b/tests/all_tests.cpp
old mode 100644
new mode 100755
diff --git a/tests/api.cpp b/tests/api.cpp
old mode 100644
new mode 100755
diff --git a/tests/bip_lock.cpp b/tests/bip_lock.cpp
old mode 100644
new mode 100755
diff --git a/tests/blinding_test.cpp b/tests/blinding_test.cpp
old mode 100644
new mode 100755
index 318f161..b363ab1
--- a/tests/blinding_test.cpp
+++ b/tests/blinding_test.cpp
@@ -42,7 +42,7 @@ static fc::string BLIND_T_X = "80deff382af8a8e4a5f297588e44d5bf858f30a524f74b13e
 static fc::string BLINDED_HASH = "7196e80cdafdfdfb7496323ad24bf47dda8447febd7426e444facc04940c7309";
 static fc::string BLIND_SIG = "40d6a477d849cc860df8ad159481f2ffc5b4dc3131b86a799d7d10460824dd53";
 static fc::string UNBLINDED = "700092a72a05e33509f9b068aa1d7c5336d8b5692b4157da199d7ec1e10fd7c0";
-
+/*
 BOOST_AUTO_TEST_CASE(test_extended_keys_1)
 {
     char seed[16];
@@ -302,3 +302,4 @@ BOOST_AUTO_TEST_CASE(openssl_blinding)
 //        printf("\nunblinded: "); print(sig->s);
 //        printf("\n");
 }
+*/
\ No newline at end of file
diff --git a/tests/bloom_test.cpp b/tests/bloom_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/compress/compress.cpp b/tests/compress/compress.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/aes_test.cpp b/tests/crypto/aes_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/base_n_tests.cpp b/tests/crypto/base_n_tests.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/bigint_test.cpp b/tests/crypto/bigint_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/blind.cpp b/tests/crypto/blind.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/blowfish_test.cpp b/tests/crypto/blowfish_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/dh_test.cpp b/tests/crypto/dh_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/ecc_test.cpp b/tests/crypto/ecc_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/log_test.cpp b/tests/crypto/log_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/rand_test.cpp b/tests/crypto/rand_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/crypto/sha_tests.cpp b/tests/crypto/sha_tests.cpp
old mode 100644
new mode 100755
diff --git a/tests/hmac_test.cpp b/tests/hmac_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/network/http/websocket_test.cpp b/tests/network/http/websocket_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/rate_limiting.cpp b/tests/rate_limiting.cpp
old mode 100644
new mode 100755
diff --git a/tests/real128_test.cpp b/tests/real128_test.cpp
old mode 100644
new mode 100755
diff --git a/tests/rpc.cpp b/tests/rpc.cpp
old mode 100644
new mode 100755
diff --git a/tests/sleep.cpp b/tests/sleep.cpp
old mode 100644
new mode 100755
diff --git a/tests/thread/task_cancel.cpp b/tests/thread/task_cancel.cpp
old mode 100644
new mode 100755
diff --git a/tests/thread/thread_tests.cpp b/tests/thread/thread_tests.cpp
new file mode 100755
index 0000000..1b7ed8e
--- /dev/null
+++ b/tests/thread/thread_tests.cpp
@@ -0,0 +1,95 @@
+#include <boost/test/unit_test.hpp>
+
+#include <fc/thread/thread.hpp>
+
+using namespace fc;
+
+BOOST_AUTO_TEST_SUITE(thread_tests)
+
+BOOST_AUTO_TEST_CASE(executes_task)
+{
+    bool called = false;
+    fc::thread thread("my");
+    thread.async([&called]{called = true;}).wait();
+    BOOST_CHECK(called);
+}
+
+BOOST_AUTO_TEST_CASE(returns_value_from_function)
+{
+    fc::thread thread("my");
+    BOOST_CHECK_EQUAL(10, thread.async([]{return 10;}).wait());
+}
+
+BOOST_AUTO_TEST_CASE(executes_multiple_tasks)
+{
+    bool called1 = false;
+    bool called2 = false;
+
+    fc::thread thread("my");
+    auto future1 = thread.async([&called1]{called1 = true;});
+    auto future2 = thread.async([&called2]{called2 = true;});
+
+    future2.wait();
+    future1.wait();
+
+    BOOST_CHECK(called1);
+    BOOST_CHECK(called2);
+}
+
+BOOST_AUTO_TEST_CASE(calls_tasks_in_order)
+{
+    std::string result;
+
+    fc::thread thread("my");
+    auto future1 = thread.async([&result]{result += "hello ";});
+    auto future2 = thread.async([&result]{result += "world";});
+
+    future2.wait();
+    future1.wait();
+
+    BOOST_CHECK_EQUAL("hello world", result);
+}
+
+BOOST_AUTO_TEST_CASE(yields_execution)
+{
+    std::string result;
+
+    fc::thread thread("my");
+    auto future1 = thread.async([&result]{fc::yield(); result += "world";});
+    auto future2 = thread.async([&result]{result += "hello ";});
+
+    future2.wait();
+    future1.wait();
+
+    BOOST_CHECK_EQUAL("hello world", result);
+}
+
+BOOST_AUTO_TEST_CASE(quits_infinite_loop)
+{
+    fc::thread thread("my");
+    auto f = thread.async([]{while (true) fc::yield();});
+
+    thread.quit();
+    BOOST_CHECK_THROW(f.wait(), fc::canceled_exception);
+}
+
+BOOST_AUTO_TEST_CASE(reschedules_yielded_task)
+{
+    int reschedule_count = 0;
+
+    fc::thread thread("my");
+    auto future = thread.async([&reschedule_count]
+            {
+                while (reschedule_count < 10)
+                {
+                    fc::yield(); 
+                    reschedule_count++;
+                }
+            });
+
+    future.wait();
+    BOOST_CHECK_EQUAL(10, reschedule_count);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
diff --git a/tests/utf8_test.cpp b/tests/utf8_test.cpp
old mode 100644
new mode 100755
diff --git a/vendor/boost_1.51/include/boost/process.hpp b/vendor/boost_1.51/include/boost/process.hpp
deleted file mode 100644
index 98e3c89..0000000
--- a/vendor/boost_1.51/include/boost/process.hpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process.hpp
- *
- * Convenience header that includes all public Boost.Process header files.
- */
-
-#ifndef BOOST_PROCESS_HPP
-#define BOOST_PROCESS_HPP
-
-#include <boost/process/all.hpp>
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/all.hpp b/vendor/boost_1.51/include/boost/process/all.hpp
deleted file mode 100644
index f30e566..0000000
--- a/vendor/boost_1.51/include/boost/process/all.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/all.hpp
- *
- * Convenience header that includes all public Boost.Process header files.
- */
-
-#ifndef BOOST_PROCESS_ALL_HPP
-#define BOOST_PROCESS_ALL_HPP
-
-#include <boost/process/child.hpp>
-#include <boost/process/context.hpp>
-#include <boost/process/environment.hpp>
-#include <boost/process/handle.hpp>
-#include <boost/process/operations.hpp>
-#include <boost/process/pid_type.hpp>
-#include <boost/process/pipe.hpp>
-#include <boost/process/pistream.hpp>
-#include <boost/process/postream.hpp>
-#include <boost/process/process.hpp>
-#include <boost/process/self.hpp>
-#include <boost/process/status.hpp>
-#include <boost/process/stream_behavior.hpp>
-#include <boost/process/stream_ends.hpp>
-#include <boost/process/stream_id.hpp>
-#include <boost/process/stream_type.hpp>
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/child.hpp b/vendor/boost_1.51/include/boost/process/child.hpp
deleted file mode 100644
index 1441e56..0000000
--- a/vendor/boost_1.51/include/boost/process/child.hpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/child.hpp
- *
- * Includes the declaration of the child class.
- */
-
-#ifndef BOOST_PROCESS_CHILD_HPP
-#define BOOST_PROCESS_CHILD_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#else
-#   error "Unsupported platform."
-#endif
-
-#include <boost/process/process.hpp>
-#include <boost/process/pid_type.hpp>
-#include <boost/process/stream_id.hpp>
-#include <boost/process/handle.hpp>
-#include <map>
-
-namespace boost {
-namespace process {
-
-/**
- * The child class provides access to a child process.
- */
-class child : public process
-{
-public:
-    /**
-     * Creates a new child object that represents the just spawned child
-     * process \a id.
-     */
-    child(pid_type id, std::map<stream_id, handle> handles)
-        : process(id),
-        handles_(handles)
-    {
-    }
-
-#if defined(BOOST_WINDOWS_API)
-    /**
-     * Creates a new child object that represents the just spawned child
-     * process \a id.
-     *
-     * This operation is only available on Windows systems.
-     */
-    child(handle hprocess, std::map<stream_id, handle> handles)
-        : process(hprocess),
-        handles_(handles)
-    {
-    }
-#endif
-
-    /**
-     * Gets a handle to a stream attached to the child.
-     *
-     * If the handle doesn't exist an invalid handle is returned.
-     */
-    handle get_handle(stream_id id) const
-    {
-        std::map<stream_id, handle>::const_iterator it = handles_.find(id);
-        return (it != handles_.end()) ? it->second : handle();
-    }
-
-#if defined(BOOST_WINDOWS_API)
-    handle::native_type get_os_handle() const
-    {
-        return handle_.native();
-    }
-#endif
-
-
-private:
-    /**
-     * Handles providing access to streams attached to the child process.
-     */
-    std::map<stream_id, handle> handles_;
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/config.hpp b/vendor/boost_1.51/include/boost/process/config.hpp
deleted file mode 100644
index 7ce15eb..0000000
--- a/vendor/boost_1.51/include/boost/process/config.hpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/config.hpp
- *
- * Defines macros that are used by the library to determine the operating
- * system it is running under and the features it supports.
- */
-
-#ifndef BOOST_PROCESS_CONFIG_HPP
-#define BOOST_PROCESS_CONFIG_HPP
-
-#include <boost/config.hpp>
-#include <boost/system/config.hpp>
-#include <boost/system/system_error.hpp>
-#include <boost/throw_exception.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <errno.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#endif
-
-#if defined(BOOST_POSIX_API) || defined(BOOST_PROCESS_DOXYGEN)
-#   if !defined(BOOST_PROCESS_POSIX_PATH_MAX) || defined(BOOST_PROCESS_DOXYGEN)
-/**
- * Specifies the system's maximal supported path length.
- *
- * The macro BOOST_PROCESS_POSIX_PATH_MAX is set to a positive integer
- * value which specifies the system's maximal supported path length. It is
- * only used if neither PATH_MAX nor _PC_PATH_MAX and HAVE_PATHCONF are defined.
- * The maximal supported path length is required by
- * boost::process::self::get_work_dir(). Please note that this function is
- * also called by the constructor of boost::process::context.
- */
-#       define BOOST_PROCESS_POSIX_PATH_MAX 259
-#   endif
-#endif
-
-/** \cond */
-#define BOOST_PROCESS_SOURCE_LOCATION \
-    "in file '" __FILE__ "', line " BOOST_STRINGIZE(__LINE__) ": "
-
-#if defined(BOOST_POSIX_API)
-#   define BOOST_PROCESS_LAST_ERROR errno
-#elif defined(BOOST_WINDOWS_API)
-#   define BOOST_PROCESS_LAST_ERROR GetLastError()
-#endif
-
-#define BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(what) \
-    boost::throw_exception(boost::system::system_error( \
-        boost::system::error_code(BOOST_PROCESS_LAST_ERROR, \
-            boost::system::get_system_category()), \
-        BOOST_PROCESS_SOURCE_LOCATION what))
-
-#define BOOST_PROCESS_THROW_ERROR(error, what) \
-    boost::throw_exception(boost::system::system_error( \
-        boost::system::error_code(error, \
-            boost::system::get_system_category()), \
-        BOOST_PROCESS_SOURCE_LOCATION what))
-/** \endcond */
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/context.hpp b/vendor/boost_1.51/include/boost/process/context.hpp
deleted file mode 100644
index 1228d9e..0000000
--- a/vendor/boost_1.51/include/boost/process/context.hpp
+++ /dev/null
@@ -1,139 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/context.hpp
- *
- * Includes the declaration of the context class.
- */
-
-#ifndef BOOST_PROCESS_CONTEXT_HPP
-#define BOOST_PROCESS_CONTEXT_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <unistd.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#endif
-
-#include <boost/process/stream_id.hpp>
-#include <boost/process/stream_ends.hpp>
-#include <boost/process/stream_type.hpp>
-#include <boost/process/environment.hpp>
-#include <boost/process/self.hpp>
-#include <boost/process/stream_behavior.hpp>
-#include <boost/function.hpp>
-#include <string>
-#include <map>
-
-namespace boost {
-namespace process {
-
-/**
- * Context class to define how a child process is created.
- *
- * The context class is used to configure streams, to set the work directory
- * and define environment variables. It is also used to change a process
- * name (the variable commonly known as argv[0]).
- */
-struct context
-{
-    typedef std::map<stream_id, boost::function<stream_ends (stream_type)> >
-        streams_t;
-
-    /**
-     * Streams.
-     *
-     * Streams of a child process can be configured through factory functions
-     * which return a pair of handles - one handle to use as a stream end
-     * in the child process and possibly another handle to use as a stream end
-     * in the parent process (if a pipe is setup both processes can communicate
-     * with each other).
-     */
-    streams_t streams;
-
-    /**
-     * Process name.
-     *
-     * The child process can access the process name via a variable
-     * commonly known as argv[0].
-     */
-    std::string process_name;
-
-    /**
-     * Work directory.
-     */
-    std::string work_dir;
-
-    /**
-     * Environment variables.
-     */
-    environment env;
-
-    /**
-     * Suppress creation of a console window on win32 (nop on other platforms)
-     */
-    bool suppress_console;
-
-    /**
-     * Constructs a process context.
-     *
-     * The default behavior of standard streams is to inherit them. The current
-     * work directory is also the work directory of the child process. The child
-     * process also inherits all environment variables.
-     */
-    context()
-        : work_dir(self::get_work_dir()),
-        env(self::get_environment()),
-        suppress_console(false)
-    {
-#if 0 // this default behavior will throw in non-console apps
-#if defined(BOOST_POSIX_API)
-        streams[stdin_id] = behavior::inherit(STDIN_FILENO);
-        streams[stdout_id] = behavior::inherit(STDOUT_FILENO);
-        streams[stderr_id] = behavior::inherit(STDERR_FILENO);
-#elif defined(BOOST_WINDOWS_API)
-        streams[stdin_id] = behavior::inherit(GetStdHandle(STD_INPUT_HANDLE));
-        streams[stdout_id] = behavior::inherit(GetStdHandle(STD_OUTPUT_HANDLE));
-        streams[stderr_id] = behavior::inherit(GetStdHandle(STD_ERROR_HANDLE));
-#endif
-#endif
-    }
-
-#if defined(BOOST_POSIX_API) || defined(BOOST_PROCESS_DOXYGEN)
-    /**
-     * Setups a child process.
-     *
-     * This is an extension point to support more configuration options for
-     * child processes. You can initialize \a setup with a user-defined function
-     * which is called when a child process is created.
-     *
-     * On POSIX platforms setup() is called in the child process. That's why in
-     * a multithreaded application only async-signal-safe functions must be
-     * called in the function \a setup is bound to.
-     *
-     * On Windows platforms setup() is called in the parent process. A
-     * reference to a STARTUPINFOA structure is passed as parameter.
-     */
-    boost::function<void ()> setup;
-#elif defined(BOOST_WINDOWS_API)
-    boost::function<void (STARTUPINFOA&)> setup;
-#endif
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/detail/basic_status.hpp b/vendor/boost_1.51/include/boost/process/detail/basic_status.hpp
deleted file mode 100644
index 2da361a..0000000
--- a/vendor/boost_1.51/include/boost/process/detail/basic_status.hpp
+++ /dev/null
@@ -1,69 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/detail/basic_status.hpp
- *
- * Includes the declaration of the basic status class.
- */
-
-#ifndef BOOST_PROCESS_DETAIL_BASIC_STATUS_HPP
-#define BOOST_PROCESS_DETAIL_BASIC_STATUS_HPP
-
-#include <boost/process/config.hpp>
-#include <boost/process/pid_type.hpp>
-#include <boost/asio.hpp>
-
-namespace boost {
-namespace process {
-namespace detail {
-
-/**
- * The basic_status class to wait for processes to exit.
- *
- * The basic_status class is a Boost.Asio I/O object and supports synchronous
- * and asynchronous wait operations. It must be instantiated with a Service.
- */
-template <typename Service>
-class basic_status
-    : public boost::asio::basic_io_object<Service>
-{
-public:
-    explicit basic_status(boost::asio::io_service &io_service)
-    : boost::asio::basic_io_object<Service>(io_service)
-    {
-    }
-
-    /**
-     * Waits synchronously for a process to exit.
-     */
-    int wait(pid_type pid)
-    {
-        return this->service.wait(this->implementation, pid);
-    }
-
-    /**
-     * Waits asynchronously for a process to exit.
-     */
-    template <typename Handler>
-    void async_wait(pid_type pid, Handler handler)
-    {
-        this->service.async_wait(this->implementation, pid, handler);
-    }
-};
-
-}
-}
-}
-
-#endif 
diff --git a/vendor/boost_1.51/include/boost/process/detail/basic_status_service.hpp b/vendor/boost_1.51/include/boost/process/detail/basic_status_service.hpp
deleted file mode 100644
index 2fd1a39..0000000
--- a/vendor/boost_1.51/include/boost/process/detail/basic_status_service.hpp
+++ /dev/null
@@ -1,323 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/detail/basic_status_service.hpp
- *
- * Includes the declaration of the basic status service class.
- */
-
-#ifndef BOOST_PROCESS_DETAIL_BASIC_STATUS_SERVICE_HPP
-#define BOOST_PROCESS_DETAIL_BASIC_STATUS_SERVICE_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <boost/process/operations.hpp>
-#   include <string>
-#   include <sys/types.h>
-#   include <sys/wait.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#else
-#   error "Unsupported platform."
-#endif
-
-#include <boost/process/pid_type.hpp>
-#include <boost/process/detail/status_impl.hpp>
-#include <boost/asio.hpp>
-#include <boost/thread.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/system/error_code.hpp>
-#include <boost/unordered_map.hpp>
-#include <vector>
-#include <algorithm>
-
-namespace boost {
-namespace process {
-namespace detail {
-
-/**
- * The basic_status_service class provides the service to wait for processes
- * synchronously and asynchronously.
- */
-template <typename StatusImplementation = status_impl>
-class basic_status_service
-    : public boost::asio::detail::service_base<StatusImplementation>
-{
-public:
-    explicit basic_status_service(boost::asio::io_service &io_service)
-        : boost::asio::detail::service_base<StatusImplementation>(io_service),
-#if defined(BOOST_POSIX_API)
-        interrupt_pid_(-1),
-        pids_(0)
-#elif defined(BOOST_WINDOWS_API)
-        run_(true)
-#endif
-    {
-#if defined(BOOST_WINDOWS_API)
-        handles_.push_back(CreateEvent(NULL, FALSE, FALSE, NULL));
-        if (handles_[0] == NULL)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CreateEvent() failed");
-        work_thread_ = boost::thread(
-            &basic_status_service<StatusImplementation>::work_thread, this);
-#endif
-    }
-
-    ~basic_status_service()
-    {
-#if defined(BOOST_POSIX_API)
-        boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-        bool worker_thread_active = (pids_ != 0);
-        lock.unlock();
-        if (worker_thread_active)
-        {
-            stop_work_thread();
-            work_thread_.join();
-        }
-#elif defined(BOOST_WINDOWS_API)
-        stop_work_thread();
-        work_thread_.join();
-        CloseHandle(handles_[0]);
-#endif
-    }
-
-    typedef boost::shared_ptr<StatusImplementation> implementation_type;
-
-    void construct(implementation_type &impl)
-    {
-        impl = boost::make_shared<StatusImplementation>();
-        boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-        impls_.push_back(impl);
-    }
-
-    void destroy(implementation_type &impl)
-    {
-        boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-        typename std::vector<implementation_type>::iterator it =
-            std::find(impls_.begin(), impls_.end(), impl);
-        if (it != impls_.end())
-            impls_.erase(it);
-#if defined(BOOST_WINDOWS_API)
-        interrupt_work_thread();
-        work_thread_cond_.wait(work_thread_mutex_);
-        impl->clear(handles_);
-        work_thread_cond_.notify_all();
-#endif
-        impl.reset();
-    }
-
-    int wait(implementation_type &impl, pid_type pid)
-    {
-        boost::system::error_code ec;
-        int status = impl->wait(pid, ec);
-#if defined(BOOST_POSIX_API)
-        if (ec.value() == ECHILD)
-        {
-            boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-            boost::unordered_map<pid_t, int>::iterator it = statuses_.find(pid);
-            if (it == statuses_.end())
-            {
-                work_thread_cond_.wait(work_thread_mutex_);
-                it = statuses_.find(pid);
-            }
-            if (it != statuses_.end())
-            {
-                status = it->second;
-                statuses_.erase(it);
-                ec.clear();
-            }
-        }
-#endif
-        boost::asio::detail::throw_error(ec);
-        return status;
-    }
-
-    template <typename Handler>
-    void async_wait(implementation_type &impl, pid_type pid, Handler handler)
-    {
-#if defined(BOOST_POSIX_API)
-        boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-        if (++pids_ == 1)
-        {
-	    // if there was a previous worker thread that exited because
-	    // pids_ dropped to 0, we must join it now to free the thread's
-	    // memory before launching a new worker thread
-	    if (work_thread_.joinable())
-	        work_thread_.join();
-            work_.reset(new boost::asio::io_service::work(
-                this->get_io_service()));
-            work_thread_ = boost::thread(
-                &basic_status_service<StatusImplementation>::work_thread,
-                this);
-        }
-        impl->async_wait(pid, this->get_io_service().wrap(handler));
-#elif defined(BOOST_WINDOWS_API)
-        HANDLE handle = OpenProcess(SYNCHRONIZE | PROCESS_QUERY_INFORMATION,
-            FALSE, pid);
-        if (handle == NULL)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("OpenProcess() failed");
-        boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-        if (!work_)
-            work_.reset(new boost::asio::io_service::work(
-                this->get_io_service()));
-        interrupt_work_thread();
-        work_thread_cond_.wait(work_thread_mutex_);
-        handles_.push_back(handle);
-        impl->async_wait(handle, this->get_io_service().wrap(handler));
-        work_thread_cond_.notify_all();
-#endif
-    }
-
-private:
-    void shutdown_service()
-    {
-#if defined(BOOST_WINDOWS_API)
-        boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-        work_.reset();
-#endif
-    }
-
-    void work_thread()
-    {
-#if defined(BOOST_POSIX_API)
-        for (;;)
-        {
-            int status;
-            pid_t pid = ::wait(&status);
-            if (pid == -1)
-            {
-                if (errno != EINTR)
-                    BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("wait(2) failed");
-            }
-            else if (interrupted(pid))
-            {
-                // On POSIX the only reason to interrupt is to break out.
-                break;
-            }
-            else
-            {
-                boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-                bool regchild = false;
-                for (typename std::vector<implementation_type>::iterator it =
-                    impls_.begin(); it != impls_.end(); ++it)
-                    regchild |= (*it)->complete(pid, status);
-                if (regchild && --pids_ == 0)
-                {
-                    work_.reset();
-                    break;
-                }
-                else if (!regchild)
-                {
-                    statuses_.insert(boost::unordered_map<pid_t, int>::
-                        value_type(pid, status));
-                    work_thread_cond_.notify_all();
-                }
-            }
-        }
-#elif defined(BOOST_WINDOWS_API)
-        for (;;)
-        {
-            DWORD res = WaitForMultipleObjects(handles_.size(), &handles_[0],
-                FALSE, INFINITE);
-            if (res == WAIT_FAILED)
-                BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                    "WaitForMultipleObjects() failed");
-            else if (res - WAIT_OBJECT_0 == 0)
-            {
-                boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-                if (!run_)
-                    break;
-                work_thread_cond_.notify_all();
-                work_thread_cond_.wait(work_thread_mutex_);
-            }
-            else if (res - WAIT_OBJECT_0 > 0)
-            {
-                HANDLE handle = handles_[res - WAIT_OBJECT_0];
-                DWORD exit_code;
-                if (!GetExitCodeProcess(handle, &exit_code))
-                    BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                        "GetExitCodeProcess() failed");
-                boost::unique_lock<boost::mutex> lock(work_thread_mutex_);
-                for (typename std::vector<implementation_type>::iterator it =
-                    impls_.begin(); it != impls_.end(); ++it)
-                    (*it)->complete(handle, exit_code);
-                std::vector<HANDLE>::iterator it = handles_.begin();
-                std::advance(it, res - WAIT_OBJECT_0);
-                handles_.erase(it);
-                if (handles_.size() == 1)
-                    work_.reset();
-            }
-        }
-#endif
-    }
-
-    void interrupt_work_thread()
-    {
-#if defined(BOOST_POSIX_API)
-        // By creating a child process which immediately exits
-        // we interrupt wait().
-        std::vector<std::string> args;
-        args.push_back("-c");
-        args.push_back("'exit'");
-        interrupt_pid_ = create_child("/bin/sh", args).get_id();
-#elif defined(BOOST_WINDOWS_API)
-        // By signaling the event in the first slot WaitForMultipleObjects()
-        // will return. The work thread won't do anything except checking if
-        // it should continue to run.
-        if (!SetEvent(handles_[0]))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("SetEvent() failed");
-#endif
-    }
-
-#if defined(BOOST_POSIX_API)
-    bool interrupted(pid_t pid)
-    {
-        boost::mutex::scoped_lock lock(work_thread_mutex_);
-        return interrupt_pid_ == pid;
-    }
-#endif
-
-    void stop_work_thread()
-    {
-        boost::mutex::scoped_lock lock(work_thread_mutex_);
-#if defined(BOOST_WINDOWS_API)
-        // Access to run_ must be sychronized with running().
-        run_ = false;
-#endif
-        // Access to interrupt_pid_ must be sychronized with interrupted().
-        interrupt_work_thread();
-    }
-
-    boost::scoped_ptr<boost::asio::io_service::work> work_;
-    std::vector<implementation_type> impls_;
-    boost::mutex work_thread_mutex_;
-    boost::thread work_thread_;
-    boost::condition_variable_any work_thread_cond_;
-#if defined(BOOST_POSIX_API)
-    pid_t interrupt_pid_;
-    int pids_;
-    boost::unordered_map<pid_t, int> statuses_;
-#elif defined(BOOST_WINDOWS_API)
-    bool run_;
-    std::vector<HANDLE> handles_;
-#endif
-};
-
-}
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/detail/posix_helpers.hpp b/vendor/boost_1.51/include/boost/process/detail/posix_helpers.hpp
deleted file mode 100644
index 993e2e0..0000000
--- a/vendor/boost_1.51/include/boost/process/detail/posix_helpers.hpp
+++ /dev/null
@@ -1,106 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/detail/posix_helpers.hpp
- *
- * Includes the declaration of helper functions for POSIX systems.
- */
-
-#ifndef BOOST_PROCESS_POSIX_HELPERS_HPP
-#define BOOST_PROCESS_POSIX_HELPERS_HPP
-
-#include <boost/process/config.hpp>
-#include <boost/process/environment.hpp>
-#include <string>
-#include <utility>
-#include <cstring>
-#include <cstddef>
-
-namespace boost {
-namespace process {
-namespace detail {
-
-/**
- * Converts an environment to a char** table as used by execve().
- *
- * Converts the environment's contents to the format used by the
- * execve() system call. The returned char** array is allocated
- * in dynamic memory; the caller must free it when not used any
- * more. Each entry is also allocated in dynamic memory and is a
- * NULL-terminated string of the form var=value; these must also be
- * released by the caller.
- *
- * This operation is only available on POSIX systems.
- *
- * \return The first argument of the pair is an integer that indicates
- *         how many strings are stored in the second argument. The
- *         second argument is a NULL-terminated, dynamically allocated
- *         array of dynamically allocated strings representing the
- *         enviroment's content. Each array entry is a NULL-terminated
- *         string of the form var=value. The caller is responsible for
- *         freeing them.
- */
-inline std::pair<std::size_t, char**> environment_to_envp(const environment
-    &env)
-{
-    std::size_t nargs = env.size();
-    char **envp = new char*[nargs + 1];
-    environment::size_type i = 0;
-    for (environment::const_iterator it = env.begin(); it != env.end(); ++it)
-    {
-        std::string s = it->first + "=" + it->second;
-        envp[i] = new char[s.size() + 1];
-        std::strncpy(envp[i], s.c_str(), s.size() + 1);
-        ++i;
-    }
-    envp[i] = 0;
-    return std::pair<std::size_t, char**>(nargs, envp);
-}
-
-/**
- * Converts the command line to an array of C strings.
- *
- * Converts the command line's list of arguments to the format expected
- * by the \a argv parameter in the POSIX execve() system call.
- *
- * This operation is only available on POSIX systems.
- *
- * \return The first argument of the pair is an integer that indicates
- *         how many strings are stored in the second argument. The
- *         second argument is a NULL-terminated, dynamically allocated
- *         array of dynamically allocated strings holding the arguments
- *         to the executable. The caller is responsible for freeing them.
- */
-template <class Arguments>
-inline std::pair<std::size_t, char**> collection_to_argv(const Arguments &args)
-{
-    std::size_t nargs = args.size();
-    char **argv = new char*[nargs + 1];
-    typename Arguments::size_type i = 0;
-    for (typename Arguments::const_iterator it = args.begin(); it != args.end();
-        ++it)
-    {
-        argv[i] = new char[it->size() + 1];
-        std::strncpy(argv[i], it->c_str(), it->size() + 1);
-        ++i;
-    }
-    argv[nargs] = 0;
-    return std::pair<std::size_t, char**>(nargs, argv);
-}
-
-}
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/detail/status_impl.hpp b/vendor/boost_1.51/include/boost/process/detail/status_impl.hpp
deleted file mode 100644
index 618db49..0000000
--- a/vendor/boost_1.51/include/boost/process/detail/status_impl.hpp
+++ /dev/null
@@ -1,190 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/detail/status_impl.hpp
- *
- * Includes the declaration of the status implementation class.
- */
-
-#ifndef BOOST_PROCESS_DETAIL_STATUS_IMPL_HPP
-#define BOOST_PROCESS_DETAIL_STATUS_IMPL_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <sys/types.h>
-#   include <signal.h>
-#   include <sys/wait.h>
-#   include <errno.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#else
-#   error "Unsupported platform."
-#endif
-
-#include <boost/process/pid_type.hpp>
-#include <boost/system/error_code.hpp>
-#include <boost/ptr_container/ptr_unordered_map.hpp>
-#include <algorithm>
-
-namespace boost {
-namespace process {
-namespace detail {
-
-#if defined(BOOST_POSIX_API)
-typedef pid_t phandle;
-#elif defined(BOOST_WINDOWS_API)
-typedef HANDLE phandle;
-#endif
-
-struct operation
-{
-    virtual ~operation(){}
-    virtual void operator()(int exit_code)
-    {
-#if defined(BOOST_MSVC)
-        exit_code;
-#endif
-    }
-};
-
-template <typename Handler>
-class wrapped_handler : public operation
-{
-public:
-    wrapped_handler(Handler handler)
-    : handler_(handler)
-    {
-    }
-
-    void operator()(int exit_code)
-    {
-        handler_(boost::system::error_code(), exit_code);
-    }
-
-private:
-    Handler handler_;
-};
-
-/**
- * The status_impl class saves internal data of every status I/O object.
- */
-class status_impl
-{
-public:
-#if defined(BOOST_WINDOWS_API)
-    template <typename Container>
-    void clear(Container &handles)
-    {
-        for (operations_type::iterator it = ops_.begin(); it != ops_.end();
-            ++it)
-        {
-            for (typename Container::iterator it2 = handles.begin(); it2 !=
-                handles.end(); ++it2)
-            {
-                if (*it2 == it->first)
-                {
-                    handles.erase(it2);
-                    break;
-                }
-            }
-            CloseHandle(it->first);
-        }
-    }
-#endif
-
-    int wait(pid_type pid, boost::system::error_code &ec)
-    {
-#if defined(BOOST_POSIX_API)
-        pid_t p;
-        int status;
-        do
-        {
-            p = waitpid(pid, &status, 0);
-        } while (p == -1 && errno == EINTR);
-        if (p == -1)
-        {
-            ec = boost::system::error_code(errno,
-                    boost::system::get_system_category());
-            return -1;
-        }
-        return status;
-#elif defined(BOOST_WINDOWS_API)
-        HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE,
-            pid);
-        if (h == NULL)
-        {
-            ec = boost::system::error_code(GetLastError(),
-                    boost::system::get_system_category());
-            return -1;
-        }
-
-        if (WaitForSingleObject(h, INFINITE) == WAIT_FAILED)
-        {
-            CloseHandle(h);
-            ec = boost::system::error_code(GetLastError(),
-                    boost::system::get_system_category());
-            return -1;
-        }
-
-        DWORD exit_code;
-        if (!GetExitCodeProcess(h, &exit_code))
-        {
-            CloseHandle(h);
-            ec = boost::system::error_code(GetLastError(),
-                    boost::system::get_system_category());
-            return -1;
-        }
-        if (!CloseHandle(h))
-        {
-            ec = boost::system::error_code(GetLastError(),
-                    boost::system::get_system_category());
-            return -1;
-        }
-        return exit_code;
-#endif
-    }
-
-    template <typename Handler>
-    void async_wait(phandle ph, Handler handler)
-    {
-        ops_.insert(ph, new wrapped_handler<Handler>(handler));
-    }
-
-    bool complete(phandle ph, int exit_code)
-    {
-        boost::iterator_range<operations_type::iterator> r =
-            ops_.equal_range(ph);
-        if (r.empty())
-            return false;
-        for (operations_type::iterator it = r.begin(); it != r.end(); ++it)
-            (*it->second)(exit_code);
-        ops_.erase(r.begin(), r.end());
-#if defined(BOOST_WINDOWS_API)
-        if (!CloseHandle(ph))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CloseHandle() failed");
-#endif
-        return true;
-    }
-
-private:
-    typedef boost::ptr_unordered_multimap<phandle, operation> operations_type;
-    operations_type ops_;
-};
-
-}
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/detail/systembuf.hpp b/vendor/boost_1.51/include/boost/process/detail/systembuf.hpp
deleted file mode 100644
index d6dce50..0000000
--- a/vendor/boost_1.51/include/boost/process/detail/systembuf.hpp
+++ /dev/null
@@ -1,228 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/detail/systembuf.hpp
- *
- * Includes the declaration of the systembuf class.
- */
-
-#ifndef BOOST_PROCESS_DETAIL_SYSTEMBUF_HPP
-#define BOOST_PROCESS_DETAIL_SYSTEMBUF_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <sys/types.h>
-#   include <unistd.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#else
-#   error "Unsupported platform."
-#endif
-
-#include <boost/noncopyable.hpp>
-#include <boost/scoped_array.hpp>
-#include <boost/assert.hpp>
-#include <streambuf>
-#include <cstddef>
-
-namespace boost {
-namespace process {
-
-class postream;
-
-namespace detail {
-
-/**
- * std::streambuf implementation for handles.
- *
- * systembuf provides a std::streambuf implementation for handles.
- * Contrarywise to the handle class, this class does \b not take
- * ownership of the native handle; this should be taken care of
- * somewhere else.
- *
- * This class follows the expected semantics of a std::streambuf object.
- * However, it is not copyable to avoid introducing inconsistences with
- * the on-disk file and the in-memory buffers.
- */
-class systembuf : public std::streambuf, public boost::noncopyable
-{
-    friend class boost::process::postream;
-
-public:
-#if defined(BOOST_PROCESS_DOXYGEN)
-    /**
-     * Opaque name for the native handle type.
-     */
-    typedef NativeHandleType handle_type;
-#elif defined(BOOST_POSIX_API)
-    typedef int handle_type;
-#elif defined(BOOST_WINDOWS_API)
-    typedef HANDLE handle_type;
-#endif
-
-    /**
-     * Constructs a new systembuf for the given handle.
-     *
-     * This constructor creates a new systembuf object that reads or
-     * writes data from/to the \a h native handle. This handle
-     * is \b not owned by the created systembuf object; the code
-     * should take care of it externally.
-     *
-     * This class buffers input and output; the buffer size may be
-     * tuned through the \a bufsize parameter, which defaults to 8192
-     * bytes.
-     *
-     * \see pistream and postream
-     */
-    explicit systembuf(handle_type h, std::size_t bufsize = 8192)
-        : handle_(h),
-          bufsize_(bufsize),
-          read_buf_(new char[bufsize]),
-          write_buf_(new char[bufsize])
-    {
-#if defined(BOOST_POSIX_API)
-        BOOST_ASSERT(handle_ >= 0);
-#elif defined(BOOST_WINDOWS_API)
-        BOOST_ASSERT(handle_ != INVALID_HANDLE_VALUE);
-#endif
-        BOOST_ASSERT(bufsize_ > 0);
-        setp(write_buf_.get(), write_buf_.get() + bufsize_);
-    }
-
-protected:
-    /**
-     * Reads new data from the native handle.
-     *
-     * This operation is called by input methods when there is no more
-     * data in the input buffer. The function fills the buffer with new
-     * data, if available.
-     *
-     * \pre All input positions are exhausted (gptr() >= egptr()).
-     * \post The input buffer has new data, if available.
-     * \returns traits_type::eof() if a read error occurrs or there are
-     *          no more data to be read. Otherwise returns
-     *          traits_type::to_int_type(*gptr()).
-     */
-    virtual int_type underflow()
-    {
-        BOOST_ASSERT(gptr() >= egptr());
-
-        bool ok;
-#if defined(BOOST_POSIX_API)
-        ssize_t cnt = read(handle_, read_buf_.get(), bufsize_);
-        ok = (cnt != -1 && cnt != 0);
-#elif defined(BOOST_WINDOWS_API)
-        DWORD cnt;
-        BOOL res = ReadFile(handle_, read_buf_.get(), bufsize_, &cnt, NULL);
-        ok = (res && cnt > 0);
-#endif
-
-        if (!ok)
-            return traits_type::eof();
-        else
-        {
-            setg(read_buf_.get(), read_buf_.get(), read_buf_.get() + cnt);
-            return traits_type::to_int_type(*gptr());
-        }
-    }
-
-    /**
-     * Makes room in the write buffer for additional data.
-     *
-     * This operation is called by output methods when there is no more
-     * space in the output buffer to hold a new element. The function
-     * first flushes the buffer's contents to disk and then clears it to
-     * leave room for more characters. The given \a c character is
-     * stored at the beginning of the new space.
-     *
-     * \pre All output positions are exhausted (pptr() >= epptr()).
-     * \post The output buffer has more space if no errors occurred
-     *       during the write to disk.
-     * \post *(pptr() - 1) is \a c.
-     * \returns traits_type::eof() if a write error occurrs. Otherwise
-     *          returns traits_type::not_eof(c).
-     */
-    virtual int_type overflow(int c)
-    {
-        BOOST_ASSERT(pptr() >= epptr());
-
-        if (sync() == -1)
-            return traits_type::eof();
-
-        if (!traits_type::eq_int_type(c, traits_type::eof()))
-        {
-            traits_type::assign(*pptr(), static_cast<traits_type::char_type>(
-                c));
-            pbump(1);
-        }
-
-        return traits_type::not_eof(c);
-    }
-
-    /**
-     * Flushes the output buffer to disk.
-     *
-     * Synchronizes the systembuf buffers with the contents of the file
-     * associated to this object through the native handle. The output buffer
-     * is flushed to disk and cleared to leave new room for more data.
-     *
-     * \returns 0 on success, -1 if an error occurred.
-     */
-    virtual int sync()
-    {
-#if defined(BOOST_POSIX_API)
-        ssize_t cnt = pptr() - pbase();
-        bool ok = (write(handle_, pbase(), cnt) == cnt);
-        if (ok)
-            pbump(-cnt);
-        return ok ? 0 : -1;
-#elif defined(BOOST_WINDOWS_API)
-        long cnt = pptr() - pbase();
-        DWORD rcnt;
-        BOOL res = WriteFile(handle_, pbase(), cnt, &rcnt, NULL);
-        bool ok = (res && static_cast<long>(rcnt) == cnt);
-        if (ok)
-            pbump(-cnt);
-        return ok ? 0 : -1;
-#endif
-    }
-
-private:
-    /**
-     * Native handle used by the systembuf object.
-     */
-    handle_type handle_;
-
-    /**
-     * Internal buffer size used during read and write operations.
-     */
-    std::size_t bufsize_;
-
-    /**
-     * Internal buffer used during read operations.
-     */
-    boost::scoped_array<char> read_buf_;
-
-    /**
-     * Internal buffer used during write operations.
-     */
-    boost::scoped_array<char> write_buf_;
-};
-
-}
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/detail/windows_helpers.hpp b/vendor/boost_1.51/include/boost/process/detail/windows_helpers.hpp
deleted file mode 100644
index 5656aaa..0000000
--- a/vendor/boost_1.51/include/boost/process/detail/windows_helpers.hpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/detail/windows_helpers.hpp
- *
- * Includes the declaration of helper functions for Windows systems.
- */
-
-#ifndef BOOST_PROCESS_WINDOWS_HELPERS_HPP
-#define BOOST_PROCESS_WINDOWS_HELPERS_HPP
-
-#include <boost/process/config.hpp>
-#include <boost/process/environment.hpp>
-#include <boost/shared_array.hpp>
-#include <string>
-#include <vector>
-#include <cstddef>
-#include <string.h>
-#include <windows.h>
-
-namespace boost {
-namespace process {
-namespace detail {
-
-/**
- * Converts an environment to a string used by CreateProcess().
- *
- * Converts the environment's contents to the format used by the
- * CreateProcess() system call. The returned char* string is
- * allocated in dynamic memory; the caller must free it when not
- * used any more. This is enforced by the use of a shared pointer.
- *
- * This operation is only available on Windows systems.
- *
- * \return A dynamically allocated char* string that represents
- *         the environment's content. This string is of the form
- *         var1=value1\\0var2=value2\\0\\0.
- */
-inline boost::shared_array<char> environment_to_windows_strings(environment
-    &env)
-{
-    boost::shared_array<char> envp;
-
-    if (env.empty())
-    {
-        envp.reset(new char[2]);
-        ZeroMemory(envp.get(), 2);
-    }
-    else
-    {
-        std::string s;
-        for (environment::const_iterator it = env.begin(); it != env.end();
-            ++it)
-        {
-            s += it->first + "=" + it->second;
-            s.push_back(0);
-        }
-        envp.reset(new char[s.size() + 1]);
-#if (BOOST_MSVC >= 1400)
-        memcpy_s(envp.get(), s.size() + 1, s.c_str(), s.size() + 1);
-#else
-        memcpy(envp.get(), s.c_str(), s.size() + 1);
-#endif
-    }
-
-    return envp;
-}
-
-/**
- * Converts the command line to a plain string.
- *
- * Converts the command line's list of arguments to the format expected by the
- * \a lpCommandLine parameter in the CreateProcess() system call.
- *
- * This operation is only available on Windows systems.
- *
- * \return A dynamically allocated string holding the command line
- *         to be passed to the executable. It is returned in a
- *         shared_array object to ensure its release at some point.
- */
-template <class Arguments>
-inline boost::shared_array<char> collection_to_windows_cmdline(const Arguments
-    &args)
-{
-    typedef std::vector<std::string> arguments_t;
-    arguments_t args2;
-    typename Arguments::size_type i = 0;
-    std::size_t size = 0;
-    for (typename Arguments::const_iterator it = args.begin(); it != args.end();
-        ++it)
-    {
-        std::string arg = *it;
-
-        std::string::size_type pos = 0;
-        while ( (pos = arg.find('"', pos)) != std::string::npos)
-        {
-            arg.replace(pos, 1, "\\\"");
-            pos += 2;
-        }
-
-        if (arg.find(' ') != std::string::npos)
-            arg = '\"' + arg + '\"';
-
-        if (i++ != args.size() - 1)
-            arg += ' ';
-
-        args2.push_back(arg);
-        size += arg.size() + 1;
-    }
-
-    boost::shared_array<char> cmdline(new char[size]);
-    cmdline.get()[0] = '\0';
-    for (arguments_t::size_type i = 0; i < args.size(); ++i)
-#if (BOOST_MSVC >= 1400)
-        strcat_s(cmdline.get(), size, args2[i].c_str());
-#else
-        strncat(cmdline.get(), args2[i].c_str(), args2[i].size());
-#endif
-
-    return cmdline;
-}
-
-}
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/environment.hpp b/vendor/boost_1.51/include/boost/process/environment.hpp
deleted file mode 100644
index daf44e3..0000000
--- a/vendor/boost_1.51/include/boost/process/environment.hpp
+++ /dev/null
@@ -1,52 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/environment.hpp
- *
- * Includes the declaration of the environment class.
- */
-
-#ifndef BOOST_PROCESS_ENVIRONMENT_HPP
-#define BOOST_PROCESS_ENVIRONMENT_HPP
-
-#include <map>
-#include <string>
-
-namespace boost {
-namespace process {
-
-/**
- * Representation of a process' environment variables.
- *
- * The environment is a map that establishes an unidirectional
- * association between variable names and their values and is
- * represented by a string to string map.
- *
- * Variables may be defined to the empty string. Be aware that doing so
- * is not portable: POSIX systems will treat such variables as being
- * defined to the empty value, but Windows systems are not able to
- * distinguish them from undefined variables.
- *
- * Neither POSIX nor Windows systems support a variable with no name.
- *
- * It is worthy to note that the environment is sorted alphabetically.
- * This is provided for-free by the map container used to implement this
- * type, and this behavior is required by Windows systems.
- */
-typedef std::map<std::string, std::string> environment;
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/handle.hpp b/vendor/boost_1.51/include/boost/process/handle.hpp
deleted file mode 100644
index b880a3e..0000000
--- a/vendor/boost_1.51/include/boost/process/handle.hpp
+++ /dev/null
@@ -1,231 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/handle.hpp
- *
- * Includes the declaration of the handle class.
- */
-
-#ifndef BOOST_PROCESS_HANDLE_HPP
-#define BOOST_PROCESS_HANDLE_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <unistd.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#else
-#   error "Unsupported platform."
-#endif
-
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-
-namespace boost {
-namespace process {
-
-/**
- * RAII model for handles.
- *
- * The \a handle class is a RAII model for native handles. This class wraps
- * one of such handles grabbing its ownership, and automaticaly closes it
- * upon destruction. It is used to avoid leaking open handles, shall an
- * unexpected execution trace occur.
- */
-class handle
-{
-public:
-#if defined(BOOST_PROCESS_DOXYGEN)
-    /**
-     * Opaque name for the native handle type.
-     *
-     * On POSIX systems \a NativeSystemHandle is an integer type while it is
-     * a \a HANDLE on Windows systems.
-     */
-    typedef NativeSystemHandle native_type;
-#elif defined(BOOST_POSIX_API)
-    typedef int native_type;
-#elif defined(BOOST_WINDOWS_API)
-    typedef HANDLE native_type;
-#endif
-
-    /**
-     * Constructs an invalid handle.
-     *
-     * \see valid()
-     */
-    handle()
-    {
-    }
-
-    /**
-     * RAII settings to specify if handle should be automatically closed.
-     */
-    enum close_type { do_close, dont_close };
-
-    /**
-     * Constructs a handle from a native handle.
-     *
-     * This constructor creates a new \a handle object that takes
-     * ownership of the given \a native handle. If \a close is set to
-     * handle::dont_close the \a native handle is not closed upon destruction.
-     * The user must not close \a native if it is owned by a \a handle object.
-     * Ownership can be reclaimed using release().
-     *
-     * \see release()
-     */
-    handle(native_type native, close_type close = handle::do_close)
-    : impl_(boost::make_shared<impl>(native, close))
-    {
-    }
-
-    /**
-     * Checks whether the handle is valid or not.
-     *
-     * \return true if the handle is valid; false otherwise.
-     */
-    bool valid() const
-    {
-        return impl_ && impl_->valid();
-    }
-
-    /**
-     * Closes the handle.
-     *
-     * \post The handle is invalid.
-     * \post The native handle is closed.
-     */
-    void close()
-    {
-        if (impl_)
-            impl_->close();
-    }
-
-    /**
-     * Gets the native handle.
-     *
-     * The caller can issue any operation on it except closing it.
-     * If closing is required, release() shall be used.
-     *
-     * \return The native handle.
-     */
-    native_type native() const
-    {
-        return impl_ ? impl_->native() : invalid_handle();
-    }
-
-    /**
-     * Reclaims ownership of the native handle.
-     *
-     * The caller is responsible of closing the native handle.
-     *
-     * \post The handle is invalid.
-     * \return The native handle.
-     */
-    native_type release()
-    {
-        return impl_ ? impl_->release() : invalid_handle();
-    }
-
-private:
-    class impl
-    {
-    public:
-        typedef handle::native_type native_type;
-
-        impl(native_type native, close_type close)
-        : native_(native),
-        close_(close)
-        {
-        }
-
-        ~impl()
-        {
-            if (valid() && close_ == handle::do_close)
-            {
-#if defined(BOOST_POSIX_API)
-                ::close(native_);
-#elif defined(BOOST_WINDOWS_API)
-                CloseHandle(native_);
-#endif
-            }
-        }
-
-        bool valid() const
-        {
-            return native_ != handle::invalid_handle();
-        }
-
-        void close()
-        {
-            if (valid())
-            {
-#if defined(BOOST_POSIX_API)
-                ::close(native_);
-#elif defined(BOOST_WINDOWS_API)
-                CloseHandle(native_);
-#endif
-                native_ = handle::invalid_handle();
-            }
-        }
-
-        native_type native() const
-        {
-            return native_;
-        }
-
-        native_type release()
-        {
-            native_type native = native_;
-            native_ = handle::invalid_handle();
-            return native;
-        }
-
-    private:
-        native_type native_;
-        close_type close_;
-    };
-
-    /**
-     * Implementation of handle to store native handle value.
-     *
-     * A shared pointer is used as handles represent system resources. If a
-     * handle is closed and becomes invalid the state of copies of the handle
-     * object will be updated as they all share the handle implementation.
-     */
-    boost::shared_ptr<impl> impl_;
-
-    /**
-     * Constant function representing an invalid handle value.
-     *
-     * Returns the platform-specific handle value that represents an
-     * invalid handle. This is a constant function rather than a regular
-     * constant because, in the latter case, we cannot define it under
-     * Windows due to the value being of a complex type.
-     */
-    static const native_type invalid_handle()
-    {
-#if defined(BOOST_POSIX_API)
-        return -1;
-#elif defined(BOOST_WINDOWS_API)
-        return INVALID_HANDLE_VALUE;
-#endif
-    }
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/operations.hpp b/vendor/boost_1.51/include/boost/process/operations.hpp
deleted file mode 100644
index 1d6da12..0000000
--- a/vendor/boost_1.51/include/boost/process/operations.hpp
+++ /dev/null
@@ -1,439 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/operations.hpp
- *
- * Provides miscellaneous free functions.
- */
-
-#ifndef BOOST_PROCESS_OPERATIONS_HPP
-#define BOOST_PROCESS_OPERATIONS_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <boost/process/detail/posix_helpers.hpp>
-#   include <utility>
-#   include <cstddef>
-#   include <stdlib.h>
-#   include <unistd.h>
-#   include <fcntl.h>
-#   if defined(__CYGWIN__)
-#       include <boost/scoped_array.hpp>
-#       include <sys/cygwin.h>
-#   endif
-#elif defined(BOOST_WINDOWS_API)
-#   include <boost/process/detail/windows_helpers.hpp>
-#   include <boost/scoped_array.hpp>
-#   include <boost/shared_array.hpp>
-#   include <windows.h>
-#else
-#   error "Unsupported platform."
-#endif
-
-#include <boost/process/child.hpp>
-#include <boost/process/context.hpp>
-#include <boost/process/stream_id.hpp>
-#include <boost/process/stream_ends.hpp>
-#include <boost/process/handle.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/system/system_error.hpp>
-#include <boost/throw_exception.hpp>
-#include <boost/assert.hpp>
-#include <string>
-#include <vector>
-#include <map>
-#include <utility>
-
-namespace boost {
-namespace process {
-
-/**
- * Locates the executable program \a file in all the directory components
- * specified in \a path. If \a path is empty, the value of the PATH
- * environment variable is used.
- *
- * The path variable is interpreted following the same conventions used
- * to parse the PATH environment variable in the underlying platform.
- *
- * \throw boost::filesystem::filesystem_error If the file cannot be found
- *        in the path.
- */
-inline std::string find_executable_in_path(const std::string &file,
-    std::string path = "")
-{
-#if defined(BOOST_POSIX_API)
-    BOOST_ASSERT(file.find('/') == std::string::npos);
-#elif defined(BOOST_WINDOWS_API)
-    BOOST_ASSERT(file.find_first_of("\\/") == std::string::npos);
-#endif
-
-    std::string result;
-
-#if defined(BOOST_POSIX_API)
-    if (path.empty())
-    {
-        const char *envpath = getenv("PATH");
-        if (!envpath)
-            boost::throw_exception(boost::filesystem::filesystem_error(
-                BOOST_PROCESS_SOURCE_LOCATION "file not found", file,
-                boost::system::errc::make_error_code(
-                boost::system::errc::no_such_file_or_directory)));
-        path = envpath;
-    }
-    BOOST_ASSERT(!path.empty());
-
-#if defined(__CYGWIN__)
-    if (!cygwin_posix_path_list_p(path.c_str()))
-    {
-        int size = cygwin_win32_to_posix_path_list_buf_size(path.c_str());
-        boost::scoped_array<char> cygpath(new char[size]);
-        cygwin_win32_to_posix_path_list(path.c_str(), cygpath.get());
-        path = cygpath.get();
-    }
-#endif
-
-    std::string::size_type pos1 = 0, pos2;
-    do
-    {
-        pos2 = path.find(':', pos1);
-        std::string dir = (pos2 != std::string::npos) ?
-            path.substr(pos1, pos2 - pos1) : path.substr(pos1);
-        std::string f = dir +
-            (boost::algorithm::ends_with(dir, "/") ? "" : "/") + file;
-        if (!access(f.c_str(), X_OK))
-            result = f;
-        pos1 = pos2 + 1;
-    } while (pos2 != std::string::npos && result.empty());
-#elif defined(BOOST_WINDOWS_API)
-    const char *exts[] = { "", ".exe", ".com", ".bat", NULL };
-    const char **ext = exts;
-    while (*ext)
-    {
-        char buf[MAX_PATH];
-        char *dummy;
-        DWORD size = SearchPathA(path.empty() ? NULL : path.c_str(),
-            file.c_str(), *ext, MAX_PATH, buf, &dummy);
-        BOOST_ASSERT(size < MAX_PATH);
-        if (size > 0)
-        {
-            result = buf;
-            break;
-        }
-        ++ext;
-    }
-#endif
-
-    if (result.empty())
-        boost::throw_exception(boost::filesystem::filesystem_error(
-            BOOST_PROCESS_SOURCE_LOCATION "file not found", file,
-            boost::system::errc::make_error_code(
-            boost::system::errc::no_such_file_or_directory)));
-
-    return result;
-}
-
-/**
- * Extracts the program name from a given executable.
- *
- * \return The program name. On Windows the program name
- *         is returned without a file extension.
- */
-inline std::string executable_to_progname(const std::string &exe)
-{
-    std::string::size_type begin = 0;
-    std::string::size_type end = std::string::npos;
-
-#if defined(BOOST_POSIX_API)
-    std::string::size_type slash = exe.rfind('/');
-#elif defined(BOOST_WINDOWS_API)
-    std::string::size_type slash = exe.find_last_of("/\\");
-#endif
-    if (slash != std::string::npos)
-        begin = slash + 1;
-
-#if defined(BOOST_WINDOWS_API)
-    if (exe.size() > 4 && (boost::algorithm::iends_with(exe, ".exe") ||
-        boost::algorithm::iends_with(exe, ".com") ||
-        boost::algorithm::iends_with(exe, ".bat")))
-        end = exe.size() - 4;
-#endif
-
-    return exe.substr(begin, end - begin);
-}
-
-/**
- * Starts a new child process.
- *
- * Launches a new process based on the binary image specified by the
- * executable, the set of arguments passed to it and the execution context.
- *
- * \remark Blocking remarks: This function may block if the device holding the
- *         executable blocks when loading the image. This might happen if, e.g.,
- *         the binary is being loaded from a network share.
- *
- * \return A handle to the new child process.
- */
-template <typename Arguments, typename Context>
-inline child create_child(const std::string &executable, Arguments args,
-    Context ctx)
-{
-    typedef std::map<stream_id, stream_ends> handles_t;
-    handles_t handles;
-    typename Context::streams_t::iterator it = ctx.streams.begin();
-    for (; it != ctx.streams.end(); ++it)
-    {
-        if (it->first == stdin_id)
-            handles[it->first] = it->second(input_stream);
-        else if (it->first == stdout_id)
-            handles[it->first] = it->second(output_stream);
-        else if (it->first == stderr_id)
-            handles[it->first] = it->second(output_stream);
-#if defined(BOOST_POSIX_API)
-        else
-            handles[it->first] = it->second(unknown_stream);
-#endif
-    }
-
-    std::string p_name = ctx.process_name.empty() ?
-        executable_to_progname(executable) : ctx.process_name;
-    args.insert(args.begin(), p_name);
-
-#if defined(BOOST_POSIX_API)
-    // Between fork() and execve() only async-signal-safe functions
-    // must be called if multithreaded applications should be supported.
-    // That's why the following code is executed before fork() is called.
-#if defined(F_MAXFD)
-    int maxdescs = fcntl(-1, F_MAXFD, 0);
-    if (maxdescs == -1)
-        maxdescs = sysconf(_SC_OPEN_MAX);
-#else
-    int maxdescs = sysconf(_SC_OPEN_MAX);
-#endif
-    if (maxdescs == -1)
-        maxdescs = 1024;
-    std::vector<bool> closeflags(maxdescs, true);
-    std::pair<std::size_t, char**> argv = detail::collection_to_argv(args);
-    std::pair<std::size_t, char**> envp =
-        detail::environment_to_envp(ctx.env);
-
-    const char *work_dir = ctx.work_dir.c_str();
-
-    pid_t pid = fork();
-    if (pid == -1)
-        BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("fork(2) failed");
-    else if (pid == 0)
-    {
-        if (chdir(work_dir) == -1)
-        {
-            auto r = write(STDERR_FILENO, "chdir() failed\n", 15);
-            if( r || !r ) _exit(127);
-        }
-
-        for (handles_t::iterator it = handles.begin(); it != handles.end();
-            ++it)
-        {
-            if (it->second.child.valid())
-            {
-                handles_t::iterator it2 = it;
-                ++it2;
-                for (; it2 != handles.end(); ++it2)
-                {
-                    if (it2->second.child.native() == it->first)
-                    {
-                        int fd = fcntl(it2->second.child.native(), F_DUPFD,
-                            it->first + 1);
-                        if (fd == -1)
-                        {
-                            auto r = write(STDERR_FILENO, "chdir() failed\n", 15);
-                            (void)r;
-                            _exit(127);
-                        }
-                        it2->second.child = fd;
-                    }
-                }
-
-                if (dup2(it->second.child.native(), it->first) == -1)
-                {
-                    auto r = write(STDERR_FILENO, "chdir() failed\n", 15);
-                    if( r || !r ) _exit(127);
-                }
-                closeflags[it->first] = false;
-            }
-        }
-
-        if (ctx.setup)
-            ctx.setup();
-
-        for (std::size_t i = 0; i < closeflags.size(); ++i)
-        {
-            if (closeflags[i])
-                close(i);
-        }
-
-        execve(executable.c_str(), argv.second, envp.second);
-
-        // Actually we should delete argv and envp data. As we must not
-        // call any non-async-signal-safe functions though we simply exit.
-        auto r  = write(STDERR_FILENO, "execve() failed\n", 16);
-        if( r || !r ) _exit(127);
-        _exit(127);
-    }
-    else
-    {
-        BOOST_ASSERT(pid > 0);
-
-        for (std::size_t i = 0; i < argv.first; ++i)
-            delete[] argv.second[i];
-        delete[] argv.second;
-
-        for (std::size_t i = 0; i < envp.first; ++i)
-            delete[] envp.second[i];
-        delete[] envp.second;
-
-        std::map<stream_id, handle> parent_ends;
-        for (handles_t::iterator it = handles.begin(); it != handles.end();
-            ++it)
-            parent_ends[it->first] = it->second.parent;
-
-        return child(pid, parent_ends);
-    }
-#elif defined(BOOST_WINDOWS_API)
-    STARTUPINFOA startup_info;
-    ZeroMemory(&startup_info, sizeof(startup_info));
-    startup_info.cb = sizeof(startup_info);
-    startup_info.dwFlags |= STARTF_USESTDHANDLES;
-    startup_info.hStdInput = handles[stdin_id].child.native();
-    startup_info.hStdOutput = handles[stdout_id].child.native();
-    startup_info.hStdError = handles[stderr_id].child.native();
-
-    if (ctx.setup)
-        ctx.setup(startup_info);
-
-    PROCESS_INFORMATION pi;
-    ZeroMemory(&pi, sizeof(pi));
-
-    boost::shared_array<char> cmdline =
-        detail::collection_to_windows_cmdline(args);
-
-    boost::scoped_array<char> exe(new char[executable.size() + 1]);
-#if (BOOST_MSVC >= 1400)
-    strcpy_s(exe.get(), executable.size() + 1, executable.c_str());
-#else
-    strcpy(exe.get(), executable.c_str());
-#endif
-
-    boost::scoped_array<char> workdir(new char[ctx.work_dir.size() + 1]);
-#if (BOOST_MSVC >= 1400)
-    strcpy_s(workdir.get(), ctx.work_dir.size() + 1, ctx.work_dir.c_str());
-#else
-    strcpy(workdir.get(), ctx.work_dir.c_str());
-#endif
-
-    boost::shared_array<char> envstrs =
-        detail::environment_to_windows_strings(ctx.env);
-
-    DWORD creation_flags = 0;
-    if (ctx.suppress_console)
-        creation_flags |= CREATE_NO_WINDOW;
-
-    if (CreateProcessA(exe.get(), cmdline.get(), NULL, NULL, TRUE, creation_flags,
-        envstrs.get(), workdir.get(), &startup_info, &pi) == 0)
-        BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CreateProcess() failed");
-
-    handle hprocess(pi.hProcess);
-
-    if (!CloseHandle(pi.hThread))
-        BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CloseHandle() failed");
-
-    std::map<stream_id, handle> parent_ends;
-    parent_ends[stdin_id] = handles[stdin_id].parent;
-    parent_ends[stdout_id] = handles[stdout_id].parent;
-    parent_ends[stderr_id] = handles[stderr_id].parent;
-
-    return child(hprocess, parent_ends);
-#endif
-}
-
-/**
- * \overload
- */
-inline child create_child(const std::string &executable)
-{
-    return create_child(executable, std::vector<std::string>(), context());
-}
-
-/**
- * \overload
- */
-template <typename Arguments>
-inline child create_child(const std::string &executable, Arguments args)
-{
-    return create_child(executable, args, context());
-}
-
-/**
- * Starts a shell-based command.
- *
- * Executes the given command through the default system shell. The
- * command is subject to pattern expansion, redirection and pipelining.
- * The shell is launched as described by the parameters in the context.
- *
- * This function behaves similarly to the system(3) system call. In a
- * POSIX system, the command is fed to /bin/sh whereas under a Windows
- * system, it is fed to cmd.exe. It is difficult to write portable
- * commands, but this function comes in handy in multiple situations.
- *
- * \remark Blocking remarks: This function may block if the device holding the
- *         executable blocks when loading the image. This might happen if, e.g.,
- *         the binary is being loaded from a network share.
- *
- * \return A handle to the new child process.
- */
-template <typename Context>
-inline child shell(const std::string &command, Context ctx)
-{
-#if defined(BOOST_POSIX_API)
-    std::string executable = "/bin/sh";
-    std::vector<std::string> args;
-    args.push_back("-c");
-    args.push_back(command);
-#elif defined(BOOST_WINDOWS_API)
-    char sysdir[MAX_PATH];
-    UINT size = GetSystemDirectoryA(sysdir, sizeof(sysdir));
-    if (!size)
-        BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("GetSystemDirectory() failed");
-    std::string executable = std::string(sysdir) +
-        (sysdir[size - 1] != '\\' ? "\\cmd.exe" : "cmd.exe");
-    std::vector<std::string> args;
-    args.push_back("/c");
-    args.push_back(command);
-#endif
-    return create_child(executable, args, ctx);
-}
-
-/**
- * \overload
- */
-inline child shell(const std::string &command)
-{
-    return shell(command, context());
-}
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/pid_type.hpp b/vendor/boost_1.51/include/boost/process/pid_type.hpp
deleted file mode 100644
index 49dc51e..0000000
--- a/vendor/boost_1.51/include/boost/process/pid_type.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/pid_type.hpp
- *
- * Includes the declaration of the pid type.
- */
-
-#ifndef BOOST_PROCESS_PID_TYPE_HPP
-#define BOOST_PROCESS_PID_TYPE_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <sys/types.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#endif
-
-namespace boost {
-namespace process {
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-/**
- * Opaque name for the process identifier type.
- *
- * Each operating system identifies processes using a specific type.
- * The \a pid_type type is used to transparently refer to a process
- * regardless of the operating system.
- *
- * This type is guaranteed to be an integral type on all supported
- * platforms. On POSIX systems it is defined as pid_t, on Windows systems as
- * DWORD.
- */
-typedef NativeProcessId pid_type;
-#elif defined(BOOST_POSIX_API)
-typedef pid_t pid_type;
-#elif defined(BOOST_WINDOWS_API)
-typedef DWORD pid_type;
-#endif
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/pipe.hpp b/vendor/boost_1.51/include/boost/process/pipe.hpp
deleted file mode 100644
index 23eb0a8..0000000
--- a/vendor/boost_1.51/include/boost/process/pipe.hpp
+++ /dev/null
@@ -1,49 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/pipe.hpp
- *
- * Includes the declaration of the pipe class.
- */
-
-#ifndef BOOST_PROCESS_PIPE_HPP
-#define BOOST_PROCESS_PIPE_HPP
-
-#include <boost/process/config.hpp>
-#include <boost/asio.hpp>
-
-namespace boost {
-namespace process {
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-/**
- * The pipe class is a type definition for stream-based classes defined by
- * Boost.Asio.
- *
- * The type definition is provided for convenience. You can also use Boost.Asio
- * classes directly for asynchronous I/O operations.
- */
-typedef BoostAsioPipe pipe;
-#elif defined(BOOST_POSIX_API)
-typedef boost::asio::posix::stream_descriptor pipe;
-#elif defined(BOOST_WINDOWS_API)
-typedef boost::asio::windows::stream_handle pipe;
-#else
-#   error "Unsupported platform."
-#endif
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/pistream.hpp b/vendor/boost_1.51/include/boost/process/pistream.hpp
deleted file mode 100644
index 9bb252f..0000000
--- a/vendor/boost_1.51/include/boost/process/pistream.hpp
+++ /dev/null
@@ -1,114 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/pistream.hpp
- *
- * Includes the declaration of the pistream class.
- */
-
-#ifndef BOOST_PROCESS_PISTREAM_HPP
-#define BOOST_PROCESS_PISTREAM_HPP
-
-#include <boost/process/handle.hpp>
-#include <boost/process/detail/systembuf.hpp>
-#include <boost/noncopyable.hpp>
-#include <istream>
-
-namespace boost {
-namespace process {
-
-/**
- * Child process' output stream.
- *
- * The pistream class represents an output communication channel with the
- * child process. The child process writes data to this stream and the
- * parent process can read it through the pistream object. In other
- * words, from the child's point of view, the communication channel is an
- * output one, but from the parent's point of view it is an input one;
- * hence the confusing pistream name.
- *
- * pistream objects cannot be copied because they buffer data
- * that flows through the communication channel.
- *
- * A pistream object behaves as a std::istream stream in all senses.
- * The class is only provided because it must provide a method to let
- * the caller explicitly close the communication channel.
- *
- * \remark Blocking remarks: Functions that read data from this
- *         stream can block if the associated handle blocks during
- *         the read. As this class is used to communicate with child
- *         processes through anonymous pipes, the most typical blocking
- *         condition happens when the child has no more data to send to
- *         the pipe's system buffer. When this happens, the buffer
- *         eventually empties and the system blocks until the writer
- *         generates some data.
- */
-class pistream : public std::istream, public boost::noncopyable
-{
-public:
-    /**
-     * Creates a new process' output stream.
-     */
-    explicit pistream(boost::process::handle h)
-        : std::istream(0),
-          handle_(h),
-          systembuf_(handle_.native())
-    {
-        rdbuf(&systembuf_);
-    }
-
-    /**
-     * Returns the handle managed by this stream.
-     */
-    const boost::process::handle &handle() const
-    {
-        return handle_;
-    }
-
-    /**
-     * Returns the handle managed by this stream.
-     */
-    boost::process::handle &handle()
-    {
-        return handle_;
-    }
-
-    /**
-     * Closes the handle managed by this stream.
-     *
-     * Explicitly closes the handle managed by this stream. This
-     * function can be used by the user to tell the child process it's
-     * not willing to receive more data.
-     */
-    void close()
-    {
-        handle_.close();
-    }
-
-private:
-    /**
-     * The handle managed by this stream.
-     */
-    boost::process::handle handle_;
-
-    /**
-     * The systembuf object used to manage this stream's data.
-     */
-    detail::systembuf systembuf_;
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/postream.hpp b/vendor/boost_1.51/include/boost/process/postream.hpp
deleted file mode 100644
index 23c34a9..0000000
--- a/vendor/boost_1.51/include/boost/process/postream.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/postream.hpp
- *
- * Includes the declaration of the postream class.
- */
-
-#ifndef BOOST_PROCESS_POSTREAM_HPP
-#define BOOST_PROCESS_POSTREAM_HPP
-
-#include <boost/process/handle.hpp>
-#include <boost/process/detail/systembuf.hpp>
-#include <boost/noncopyable.hpp>
-#include <ostream>
-
-namespace boost {
-namespace process {
-
-/**
- * Child process' input stream.
- *
- * The postream class represents an input communication channel with the
- * child process. The child process reads data from this stream and the
- * parent process can write to it through the postream object. In other
- * words, from the child's point of view, the communication channel is an
- * input one, but from the parent's point of view it is an output one;
- * hence the confusing postream name.
- *
- * postream objects cannot be copied because they buffer data that flows
- * through the communication channel.
- *
- * A postream object behaves as a std::ostream stream in all senses.
- * The class is only provided because it must provide a method to let
- * the caller explicitly close the communication channel.
- *
- * \remark Blocking remarks: Functions that write data to this
- *         stream can block if the associated handle blocks during
- *         the write. As this class is used to communicate with child
- *         processes through anonymous pipes, the most typical blocking
- *         condition happens when the child is not processing the data
- *         in the pipe's system buffer. When this happens, the buffer
- *         eventually fills up and the system blocks until the reader
- *         consumes some data, leaving some new room.
- */
-class postream : public std::ostream, public boost::noncopyable
-{
-public:
-    /**
-     * Creates a new process' input stream.
-     */
-    explicit postream(boost::process::handle h)
-        : std::ostream(0),
-          handle_(h),
-          systembuf_(handle_.native())
-    {
-        rdbuf(&systembuf_);
-    }
-
-    /**
-     * Returns the handle managed by this stream.
-     */
-    const boost::process::handle &handle() const
-    {
-        return handle_;
-    }
-
-    /**
-     * Returns the handle managed by this stream.
-     */
-    boost::process::handle &handle()
-    {
-        return handle_;
-    }
-
-    /**
-     * Closes the handle managed by this stream.
-     *
-     * Explicitly closes the handle managed by this stream. This
-     * function can be used by the user to tell the child process there
-     * is no more data to send.
-     */
-    void close()
-    {
-        systembuf_.sync();
-        handle_.close();
-    }
-
-private:
-    /**
-     * The handle managed by this stream.
-     */
-    boost::process::handle handle_;
-
-    /**
-     * The systembuf object used to manage this stream's data.
-     */
-    detail::systembuf systembuf_;
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/process.hpp b/vendor/boost_1.51/include/boost/process/process.hpp
deleted file mode 100644
index e0e2149..0000000
--- a/vendor/boost_1.51/include/boost/process/process.hpp
+++ /dev/null
@@ -1,213 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/process.hpp
- *
- * Includes the declaration of the process class.
- */
-
-#ifndef BOOST_PROCESS_PROCESS_HPP
-#define BOOST_PROCESS_PROCESS_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <unistd.h>
-#   include <sys/types.h>
-#   include <signal.h>
-#   include <sys/wait.h>
-#   include <errno.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <boost/process/handle.hpp>
-#   include <cstdlib>
-#   include <windows.h>
-#else
-#   error "Unsupported platform."
-#endif
-
-#include <boost/process/pid_type.hpp>
-
-namespace boost {
-namespace process {
-
-/**
- * Process class to represent any running process.
- */
-class process
-{
-public:
-    /**
-     * Constructs a new process object.
-     *
-     * Creates a new process object that represents a running process
-     * within the system.
-     *
-     * On Windows the process is opened and a handle saved. This is required
-     * to avoid the operating system removing process resources when the
-     * process exits. The handle is closed when the process instance (and all
-     * of its copies) is destroyed.
-     */
-    process(pid_type id)
-        : id_(id)
-#if defined(BOOST_WINDOWS_API)
-        , handle_(open_process(id))
-#endif
-    {
-    }
-
-#if defined(BOOST_WINDOWS_API) || defined(BOOST_PROCESS_DOXYGEN)
-    /**
-     * Constructs a new process object.
-     *
-     * Creates a new process object that represents a running process
-     * within the system.
-     *
-     * This operation is only available on Windows systems. The handle is
-     * closed when the process instance (and all of its copies) is destroyed.
-     */
-    process(handle h)
-        : id_(GetProcessId(h.native())),
-        handle_(h)
-    {
-    }
-#endif
-
-    /**
-     * Returns the process identifier.
-     */
-    pid_type get_id() const
-    {
-        return id_;
-    }
-
-    /**
-     * Terminates the process execution.
-     *
-     * Forces the termination of the process execution. Some platforms
-     * allow processes to ignore some external termination notifications
-     * or to capture them for a proper exit cleanup. You can set the
-     * \a force flag to true to force their termination regardless
-     * of any exit handler.
-     *
-     * After this call, accessing this object can be dangerous because the
-     * process identifier may have been reused by a different process. It
-     * might still be valid, though, if the process has refused to die.
-     *
-     * \throw boost::system::system_error If system calls used to terminate the
-     *        process fail.
-     */
-    void terminate(bool force = false) const
-    {
-#if defined(BOOST_POSIX_API)
-        if (kill(id_, force ? SIGKILL : SIGTERM) == -1)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("kill(2) failed");
-#elif defined(BOOST_WINDOWS_API)
-#if defined(BOOST_MSVC)
-        force;
-#endif
-        HANDLE h = OpenProcess(PROCESS_TERMINATE, FALSE, id_);
-        if (h == NULL)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("OpenProcess() failed");
-        if (!TerminateProcess(h, EXIT_FAILURE))
-        {
-            CloseHandle(h);
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("TerminateProcess() failed");
-        }
-        if (!CloseHandle(h))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CloseHandle() failed");
-#endif
-    }
-
-    /**
-     * Blocks and waits for the process to terminate.
-     *
-     * Returns an exit code. The process object ceases to be valid after this
-     * call.
-     *
-     * \remark Blocking remarks: This call blocks if the process has not
-     *         finalized execution and waits until it terminates.
-     *
-     * \throw boost::system::system_error If system calls used to wait for the
-     *        process fail.
-     */
-    int wait() const
-    {
-#if defined(BOOST_POSIX_API)
-        pid_t p;
-        int status;
-        do
-        {
-            p = waitpid(id_, &status, 0);
-        } while (p == -1 && errno == EINTR);
-        if (p == -1)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("waitpid(2) failed");
-        return status;
-#elif defined(BOOST_WINDOWS_API)
-        HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE, FALSE,
-            id_);
-        if (h == NULL) 
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("OpenProcess() failed");
-        if (WaitForSingleObject(h, INFINITE) == WAIT_FAILED)
-        {
-            CloseHandle(h);
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                "WaitForSingleObject() failed");
-        }
-        DWORD exit_code;
-        if (!GetExitCodeProcess(h, &exit_code))
-        {
-            CloseHandle(h);
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                "GetExitCodeProcess() failed");
-        }
-        if (!CloseHandle(h))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CloseHandle() failed");
-        return exit_code;
-#endif
-    }
-
-private:
-    /**
-     * The process identifier.
-     */
-    pid_type id_;
-
-#if defined(BOOST_WINDOWS_API)
-    /**
-     * Opens a process and returns a handle.
-     *
-     * OpenProcess() returns NULL and not INVALID_HANDLE_VALUE on failure.
-     * That's why the return value is manually checked in this helper function
-     * instead of simply passing it to the constructor of the handle class.
-     */
-    HANDLE open_process(pid_type id)
-    {
-        HANDLE h = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, id);
-        if (h == NULL)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("OpenProcess() failed");
-        return h;
-    }
-protected:
-    /**
-     * The process handle.
-     */
-    handle handle_;
-private:
-#endif
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/self.hpp b/vendor/boost_1.51/include/boost/process/self.hpp
deleted file mode 100644
index 704501c..0000000
--- a/vendor/boost_1.51/include/boost/process/self.hpp
+++ /dev/null
@@ -1,188 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/self.hpp
- *
- * Includes the declaration of the self class.
- */
-
-#ifndef BOOST_PROCESS_SELF_HPP
-#define BOOST_PROCESS_SELF_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <boost/scoped_array.hpp>
-#   include <errno.h>
-#   include <unistd.h>
-#   include <limits.h>
-#   if defined(__APPLE__)
-#       include <crt_externs.h>
-#   endif
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#else
-#   error "Unsupported platform." 
-#endif
-
-#include <boost/process/process.hpp>
-#include <boost/process/environment.hpp>
-#include <boost/noncopyable.hpp>
-#include <boost/assert.hpp>
-#include <string>
-
-#if defined(BOOST_POSIX_API)
-extern "C"
-{
-    extern char **environ;
-}
-#endif
-
-namespace boost {
-namespace process {
-
-/**
- * The self class provides access to the process itself.
- */
-class self : public process, public boost::noncopyable
-{
-public:
-    /**
-     * Returns the self instance representing the caller's process.
-     */
-    static self &get_instance()
-    {
-        static self *instance = 0;
-        if (!instance)
-            instance = new self;
-        return *instance;
-    }
-
-    /**
-     * Returns the current environment.
-     *
-     * Returns the current process environment variables. Modifying the
-     * returned object has no effect on the current environment.
-     */
-    static environment get_environment()
-    {
-        environment e;
-
-#if defined(BOOST_POSIX_API)
-#   if defined(__APPLE__)
-        char **env = *_NSGetEnviron();
-#   else
-        char **env = environ;
-#   endif
-
-        while (*env)
-        {
-            std::string s = *env;
-            std::string::size_type pos = s.find('=');
-            e.insert(environment::value_type(s.substr(0, pos),
-                s.substr(pos + 1)));
-            ++env;
-        }
-#elif defined(BOOST_WINDOWS_API)
-#   ifdef GetEnvironmentStrings
-#   undef GetEnvironmentStrings
-#   endif
-
-        char *ms_environ = GetEnvironmentStrings();
-        if (!ms_environ)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                "GetEnvironmentStrings() failed");
-        try
-        {
-            char *env = ms_environ;
-            while (*env)
-            {
-                std::string s = env;
-                std::string::size_type pos = s.find('=');
-                e.insert(environment::value_type(s.substr(0, pos),
-                    s.substr(pos + 1)));
-                env += s.size() + 1;
-            }
-        }
-        catch (...)
-        {
-            FreeEnvironmentStringsA(ms_environ);
-            throw;
-        }
-        FreeEnvironmentStringsA(ms_environ);
-#endif
-
-        return e;
-    }
-
-    /**
-     * Returns the current work directory.
-     */
-    static std::string get_work_dir()
-    {
-#if defined(BOOST_POSIX_API)
-#if defined(PATH_MAX)
-        char buffer[PATH_MAX];
-        char *cwd = buffer;
-        long size = PATH_MAX;
-#elif defined(_PC_PATH_MAX)
-        errno = 0;
-        long size = pathconf("/", _PC_PATH_MAX);
-        if (size == -1 && errno)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("pathconf(2) failed");
-        else if (size == -1)
-            size = BOOST_PROCESS_POSIX_PATH_MAX;
-        BOOST_ASSERT(size > 0);
-        boost::scoped_array<char> buffer(new char[size]);
-        char *cwd = buffer.get();
-#else
-        char buffer[BOOST_PROCESS_POSIX_PATH_MAX];
-        char *cwd = buffer;
-        long size = BOOST_PROCESS_POSIX_PATH_MAX;
-#endif
-        if (!getcwd(cwd, size))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("getcwd(2) failed");
-        BOOST_ASSERT(cwd[0] != '\0');
-        return cwd;
-#elif defined(BOOST_WINDOWS_API)
-        BOOST_ASSERT(MAX_PATH > 0);
-        char cwd[MAX_PATH];
-        if (!GetCurrentDirectoryA(sizeof(cwd), cwd))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                "GetCurrentDirectory() failed");
-        BOOST_ASSERT(cwd[0] != '\0');
-        return cwd;
-#endif
-    }
-
-private:
-    /**
-     * Constructs a new self object.
-     *
-     * Creates a new self object that represents the current process.
-     */
-    self() :
-#if defined(BOOST_POSIX_API)
-        process(getpid())
-#elif defined(BOOST_WINDOWS_API)
-        process(GetCurrentProcessId())
-#endif
-    {
-    }
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/status.hpp b/vendor/boost_1.51/include/boost/process/status.hpp
deleted file mode 100644
index 55b89f3..0000000
--- a/vendor/boost_1.51/include/boost/process/status.hpp
+++ /dev/null
@@ -1,41 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/status.hpp
- *
- * Includes the declaration of the status class.
- */
-
-#ifndef BOOST_PROCESS_STATUS_HPP
-#define BOOST_PROCESS_STATUS_HPP
-
-#include <boost/process/config.hpp>
-#include <boost/process/detail/basic_status.hpp>
-#include <boost/process/detail/basic_status_service.hpp>
-
-namespace boost {
-namespace process {
-
-/**
- * The status class to wait for processes to exit.
- *
- * The status class is a Boost.Asio I/O object and supports synchronous
- * and asynchronous wait operations.
- */
-typedef detail::basic_status<detail::basic_status_service<> > status;
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/stream_behavior.hpp b/vendor/boost_1.51/include/boost/process/stream_behavior.hpp
deleted file mode 100644
index 2911f56..0000000
--- a/vendor/boost_1.51/include/boost/process/stream_behavior.hpp
+++ /dev/null
@@ -1,326 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/stream_behavior.hpp
- *
- * Includes the declaration of stream behavior classes.
- */
-
-#ifndef BOOST_PROCESS_STREAM_BEHAVIOR_HPP
-#define BOOST_PROCESS_STREAM_BEHAVIOR_HPP
-
-#include <boost/process/config.hpp>
-
-#if defined(BOOST_POSIX_API)
-#   include <sys/stat.h>
-#   include <fcntl.h>
-#   include <unistd.h>
-#elif defined(BOOST_WINDOWS_API)
-#   include <windows.h>
-#   include <rpc.h>
-#endif
-
-#include <boost/process/stream_ends.hpp>
-#include <boost/process/stream_type.hpp>
-#include <boost/process/handle.hpp>
-#include <string>
-#include <algorithm>
-
-namespace boost {
-namespace process {
-namespace behavior {
-
-/**
- * Stream behavior to close streams of a child process.
- *
- * A child process will not be able to use the stream.
- */
-class close
-{
-public:
-    stream_ends operator()(stream_type) const
-    {
-        return stream_ends();
-    }
-};
-
-/**
- * Stream behavior to make a child process inherit streams.
- *
- * A child process will use the very same stream of its parent process.
- */
-class inherit
-{
-public:
-    inherit(handle::native_type h)
-    : h_(h, handle::dont_close)
-    {
-#if defined(BOOST_WINDOWS_API)
-        if (h != INVALID_HANDLE_VALUE)
-        {
-            if (!SetHandleInformation(h_.native(), HANDLE_FLAG_INHERIT,
-                HANDLE_FLAG_INHERIT))
-            {
-                HANDLE proc = GetCurrentProcess();
-                HANDLE dup;
-                if (!DuplicateHandle(proc, h_.native(), proc, &dup, 0,
-                    TRUE, DUPLICATE_SAME_ACCESS))
-                {
-                    BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                        "DuplicateHandle() failed");
-                }
-                h_ = dup;
-            }
-        }
-#endif
-    }
-
-    stream_ends operator()(stream_type) const
-    {
-        return stream_ends(h_, handle());
-    }
-
-private:
-    handle h_;
-};
-
-/**
- * Stream behavior to redirect streams with a pipe.
- *
- * A child process will be able to communicate with its parent process.
- */
-class pipe
-{
-public:
-#if defined(BOOST_POSIX_API)
-    pipe()
-    : stype_(unknown_stream)
-    {
-    }
-
-    pipe(stream_type stype)
-    : stype_(stype)
-    {
-    }
-#endif
-
-    stream_ends operator()(stream_type stype) const
-    {
-        handle::native_type ends[2];
-#if defined(BOOST_POSIX_API)
-        if (::pipe(ends) == -1)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("pipe(2) failed");
-        if (stype_ != unknown_stream)
-            stype = stype_;
-#elif defined(BOOST_WINDOWS_API)
-        SECURITY_ATTRIBUTES sa;
-        ZeroMemory(&sa, sizeof(sa));
-        sa.nLength = sizeof(sa);
-        sa.lpSecurityDescriptor = NULL;
-        sa.bInheritHandle = FALSE;
-        if (!CreatePipe(&ends[0], &ends[1], &sa, 0))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CreatePipe() failed");
-#endif 
-        handle child_end = ends[stype == input_stream ? 0 : 1];
-        handle parent_end = ends[stype == input_stream ? 1 : 0];
-#if defined(BOOST_WINDOWS_API)
-        if (!SetHandleInformation(child_end.native(), HANDLE_FLAG_INHERIT,
-            HANDLE_FLAG_INHERIT))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                "SetHandleInformation() failed");
-#endif
-        return stream_ends(child_end, parent_end);
-    }
-
-#if defined(BOOST_POSIX_API)
-private:
-    stream_type stype_;
-#endif
-};
-
-/**
- * Stream behavior to redirect streams with a named pipe.
- *
- * A child process will be able to communicate with its parent process.
- */
-class named_pipe
-{
-public:
-    named_pipe(const std::string &name)
-    : name_(name)
-#if defined(BOOST_POSIX_API)
-    , stype_(unknown_stream)
-#endif
-    {
-    }
-
-#if defined(BOOST_POSIX_API)
-    named_pipe(const std::string &name, stream_type stype)
-    : name_(name),
-    stype_(stype)
-    {
-    }
-#endif
-
-    stream_ends operator()(stream_type stype) const
-    {
-#if defined(BOOST_POSIX_API)
-        if (mkfifo(name_.c_str(), S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) == -1)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("mkfifo(3) failed");
-        handle child_end = open(name_.c_str(), O_RDONLY | O_NONBLOCK);
-        if (!child_end.valid())
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("open(2) failed");
-        int opts = fcntl(child_end.native(), F_GETFL);
-        if (opts == -1)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("fcntl(2) failed");
-        opts ^= O_NONBLOCK;
-        if (fcntl(child_end.native(), F_SETFL, opts) == -1)
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("fcntl(2) failed");
-        handle parent_end = open(name_.c_str(), O_WRONLY);
-        if (!parent_end.valid())
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("open(2) failed");
-        if (stype_ != unknown_stream)
-            stype = stype_;
-#elif defined(BOOST_WINDOWS_API)
-        SECURITY_ATTRIBUTES sa;
-        ZeroMemory(&sa, sizeof(sa));
-        sa.nLength = sizeof(sa);
-        sa.lpSecurityDescriptor = NULL;
-        sa.bInheritHandle = TRUE;
-        handle child_end = CreateNamedPipeA(name_.c_str(), PIPE_ACCESS_INBOUND |
-            FILE_FLAG_OVERLAPPED, 0, 1, 8192, 8192, 0, &sa);
-        if (!child_end.valid())
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CreateNamedPipe() failed");
-        handle parent_end = CreateFileA(name_.c_str(), GENERIC_WRITE, 0, NULL,
-            OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
-        if (!parent_end.valid())
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CreateFile() failed");
-#endif
-        if (stype == output_stream)
-            std::swap(child_end, parent_end);
-#if defined(BOOST_WINDOWS_API)
-        if (!SetHandleInformation(child_end.native(), HANDLE_FLAG_INHERIT,
-            HANDLE_FLAG_INHERIT))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                "SetHandleInformation() failed");
-#endif
-        return stream_ends(child_end, parent_end);
-    }
-
-private:
-    std::string name_;
-
-#if defined(BOOST_POSIX_API)
-    stream_type stype_;
-#endif
-};
-
-/**
- * Stream behavior to redirect streams with a pipe which supports asynchronous
- * I/O.
- *
- * As platforms require different types of pipes for asynchronous I/O this
- * stream behavior is provided for convenience. It uses the minimum required
- * pipe type on a platform in order to be able to use asynchronous I/O.
- */
-#if defined(BOOST_POSIX_API) || defined(BOOST_PROCESS_DOXYGEN)
-typedef pipe async_pipe;
-#elif defined(BOOST_WINDOWS_API)
-class async_pipe
-{
-public:
-    stream_ends operator()(stream_type stype) const
-    {
-        UUID uuid;
-        RPC_STATUS s = UuidCreateSequential(&uuid);
-        if (s != RPC_S_OK && s != RPC_S_UUID_LOCAL_ONLY)
-            BOOST_PROCESS_THROW_ERROR(s, "UuidCreateSequential() failed");
-        unsigned char *c;
-        s = UuidToStringA(&uuid, &c);
-        if (s != RPC_S_OK)
-            BOOST_PROCESS_THROW_ERROR(s, "UuidToString() failed");
-        std::string name;
-        try
-        {
-            name = reinterpret_cast<char*>(c);
-        }
-        catch (...)
-        {
-            RpcStringFreeA(&c);
-            throw;
-        }
-        RpcStringFreeA(&c);
-        named_pipe p("\\\\.\\pipe\\boost_process_" + name);
-        return p(stype);
-    }
-};
-#endif
-
-/**
- * Stream behavior to mute streams.
- *
- * A child process will be able to use streams. But data written to an
- * output stream is discarded and data read from an input stream is 0.
- */
-class null
-{
-public:
-#if defined(BOOST_POSIX_API)
-    null()
-    : stype_(unknown_stream)
-    {
-    }
-
-    null(stream_type stype)
-    : stype_(stype)
-    {
-    }
-#endif
-
-    stream_ends operator()(stream_type stype) const
-    {
-#if defined(BOOST_POSIX_API)
-        if (stype_ != unknown_stream)
-            stype = stype_;
-        std::string filename = (stype == input_stream) ? "/dev/zero" :
-            "/dev/null";
-        int flag = (stype == input_stream) ? O_RDONLY : O_WRONLY;
-        handle child_end = open(filename.c_str(), flag);
-        if (!child_end.valid())
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("open(2) failed");
-#elif defined(BOOST_WINDOWS_API)
-        DWORD access = (stype == input_stream) ? GENERIC_READ : GENERIC_WRITE;
-        handle child_end = CreateFileA("NUL", access, 0, NULL, OPEN_EXISTING,
-            FILE_ATTRIBUTE_NORMAL, NULL);
-        if (!child_end.valid())
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR("CreateFile() failed");
-        if (!SetHandleInformation(child_end.native(), HANDLE_FLAG_INHERIT,
-            HANDLE_FLAG_INHERIT))
-            BOOST_PROCESS_THROW_LAST_SYSTEM_ERROR(
-                "SetHandleInformation() failed");
-#endif
-        return stream_ends(child_end, handle());
-    }
-
-#if defined(BOOST_POSIX_API)
-private:
-    stream_type stype_;
-#endif
-};
-
-}
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/stream_ends.hpp b/vendor/boost_1.51/include/boost/process/stream_ends.hpp
deleted file mode 100644
index 2ae87a1..0000000
--- a/vendor/boost_1.51/include/boost/process/stream_ends.hpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/stream_ends.hpp
- *
- * Includes the declaration of the stream_ends class.
- */
-
-#ifndef BOOST_PROCESS_STREAM_ENDS_HPP
-#define BOOST_PROCESS_STREAM_ENDS_HPP
-
-#include <boost/process/config.hpp>
-#include <boost/process/handle.hpp>
-
-namespace boost {
-namespace process {
-
-/**
- * A pair of handles to configure streams.
- *
- * Stream behaviors return a pair of handles to specify how a child's stream
- * should be configured and possibly the opposite end of a child's end. This
- * is the end remaining in the parent process and which can be used for example
- * to communicate with a child process through its standard streams.
- */
-struct stream_ends {
-    /**
-     * The child's end.
-     */
-    handle child;
-
-    /**
-     * The parent's end.
-     */
-    handle parent;
-
-    /**
-     * Standard constructor creating two invalid handles.
-     */
-    stream_ends()
-    {
-    }
-
-    /**
-     * Helper constructor to easily initialize handles.
-     */
-    stream_ends(handle c, handle p)
-    : child(c),
-    parent(p)
-    {
-    }
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/stream_id.hpp b/vendor/boost_1.51/include/boost/process/stream_id.hpp
deleted file mode 100644
index cb098c7..0000000
--- a/vendor/boost_1.51/include/boost/process/stream_id.hpp
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/stream_id.hpp
- *
- * Includes the declaration of the stream_id type.
- */
-
-#ifndef BOOST_PROCESS_STREAM_ID_HPP
-#define BOOST_PROCESS_STREAM_ID_HPP
-
-#include <boost/process/config.hpp>
-
-namespace boost {
-namespace process {
-
-/**
- * Standard stream id to refer to standard streams in a cross-platform manner.
- */
-enum std_stream_id { stdin_id, stdout_id, stderr_id };
-
-#if defined(BOOST_PROCESS_DOXYGEN)
-/**
- * Stream id type.
- *
- * Depending on the platform the stream id type is defined to refer to standard
- * streams only or to support more streams.
- */
-typedef NativeStreamId stream_id;
-#elif defined(BOOST_POSIX_API)
-typedef int stream_id;
-#elif defined(BOOST_WINDOWS_API)
-typedef std_stream_id stream_id;
-#endif
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/include/boost/process/stream_type.hpp b/vendor/boost_1.51/include/boost/process/stream_type.hpp
deleted file mode 100644
index d78c1f9..0000000
--- a/vendor/boost_1.51/include/boost/process/stream_type.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// Boost.Process
-// ~~~~~~~~~~~~~
-//
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
-// Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
-// Copyright (c) 2009 Boris Schaeling
-// Copyright (c) 2010 Felipe Tanus, Boris Schaeling
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
-
-/**
- * \file boost/process/stream_type.hpp
- *
- * Includes the declaration of the stream_type enumeration.
- */
-
-#ifndef BOOST_PROCESS_STREAM_TYPE_HPP
-#define BOOST_PROCESS_STREAM_TYPE_HPP
-
-#include <boost/process/config.hpp>
-
-namespace boost {
-namespace process {
-
-/**
- * Stream type to differentiate between input and output streams.
- *
- * On POSIX systems another value unknown_stream is defined. It is passed
- * to stream behaviors for file descriptors greater than 2.
- */
-enum stream_type {
-    input_stream,
-    output_stream
-#if defined(BOOST_POSIX_API)
-    , unknown_stream
-#endif
-};
-
-}
-}
-
-#endif
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_arm_aapcs_elf_gas.S b/vendor/boost_1.51/libs/context/asm/fcontext_arm_aapcs_elf_gas.S
deleted file mode 100644
index 7724441..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_arm_aapcs_elf_gas.S
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/*******************************************************************
- *                                                                 *
- *  -------------------------------------------------------------  *
- *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  *
- *  -------------------------------------------------------------  *
- *  | 0x0 | 0x4 | 0x8 | 0xc | 0x10| 0x14| 0x18| 0x1c| 0x20| 0x24|  *
- *  -------------------------------------------------------------  *
- *  |  v1 |  v2 |  v3 |  v4 |  v5 |  v6 |  v7 |  v8 |  sp |  lr |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  10 |                                                     |  *
- *  -------------------------------------------------------------  *
- *  | 0x28|                                                     |  *
- *  -------------------------------------------------------------  *
- *  |  pc |                                                     |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  11 |  12 |                                               |  *
- *  -------------------------------------------------------------  *
- *  | 0x2c| 0x30|                                               |  *
- *  -------------------------------------------------------------  *
- *  |sbase|slimit|                                              |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  13 |  14 | 15 |  16 |  17 |  18 |  19 |  20 |  21 |  22  |  *
- *  -------------------------------------------------------------  *
- *  | 0x34| 0x38|0x3c| 0x40| 0x44| 0x48| 0x4c| 0x50| 0x54| 0x58 |  *
- *  -------------------------------------------------------------  *
- *  | s16 | s17 | s18 | s19 | s20 | s21 | s22 | s23 | s24 | s25 |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  23 |  24 |  25 |  26 |  27 |  28 |                       |  *
- *  -------------------------------------------------------------  *
- *  | 0x5c| 0x60| 0x64| 0x68| 0x6c| 0x70|                       |  *
- *  -------------------------------------------------------------  *
- *  | s26 | s27 | s28 | s29 | s30 | s31 |                       |  *
- *  -------------------------------------------------------------  *
- *                                                                 *
- * *****************************************************************/
-
-.text
-.globl jump_fcontext
-.align 2
-.type jump_fcontext,%function
-jump_fcontext:
-    stmia   a1, {v1-v8,sp-lr}       @ save V1-V8,SP-LR
-    str     lr, [a1,#40]            @ save LR as PC
-
-#if (defined(__VFP_FP__) && !defined(__SOFTFP__))
-    cmp     a4, #0                  @ test if fpu env should be preserved
-    beq     1f
-
-    mov     a4, a1
-    add     a4, #52
-    fstmiax a4, {d8-d15}            @ save S16-S31
-
-    mov     a4, a2
-    add     a4, #52
-    fldmiax a4, {d8-d15}            @ restore S16-S31
-1:
-#endif
-
-    mov     a1, a3                  @ use third arg as return value after jump
-                                    @ and as first arg in context function
-    ldmia   a2, {v1-v8,sp-pc}       @ restore v1-V8,SP-PC
-.size jump_fcontext,.-jump_fcontext
-
-.text
-.globl make_fcontext
-.align 2
-.type make_fcontext,%function
-make_fcontext:
-    str     a1, [a1,#0]         @ save the address of passed context
-    str     a2, [a1,#40]        @ save address of the context function
-    ldr     a2, [a1,#44]        @ load the stack base
-
-    push    {a1,lr}             @ save pointer to fcontext_t
-    mov     a1, a2              @ stack pointer as arg for align_stack
-    bl      align_stack@PLT     @ align stack
-    mov     a2, a1              @ begin of aligned stack
-    pop     {a1,lr}             @ restore pointer to fcontext_t
-
-    str     a2, [a1,#32]        @ save the aligned stack base
-
-    adr     a2, finish          @ address of finish; called after context function returns
-    str     a2, [a1,#36]
-
-    mov     a1, #0
-    bx      lr
-
-finish:
-    mov     a1, #0              @ exit code is zero
-    bl      _exit@PLT           @ exit application
-.size make_fcontext,.-make_fcontext
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_i386_ms_pe_masm.asm b/vendor/boost_1.51/libs/context/asm/fcontext_i386_ms_pe_masm.asm
deleted file mode 100644
index 0f4dd67..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_i386_ms_pe_masm.asm
+++ /dev/null
@@ -1,151 +0,0 @@
-
-;           Copyright Oliver Kowalke 2009.
-;  Distributed under the Boost Software License, Version 1.0.
-;     (See accompanying file LICENSE_1_0.txt or copy at
-;           http://www.boost.org/LICENSE_1_0.txt)
-
-;  --------------------------------------------------------------
-;  |    0    |    1    |    2    |    3    |    4     |    5    |
-;  --------------------------------------------------------------
-;  |    0h   |   04h   |   08h   |   0ch   |   010h   |   014h  |
-;  --------------------------------------------------------------
-;  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |
-;  --------------------------------------------------------------
-;  --------------------------------------------------------------
-;  |    6    |    7    |                                        |
-;  --------------------------------------------------------------
-;  |   018h  |   01ch  |                                        |
-;  --------------------------------------------------------------
-;  | ss_base | ss_limit|                                        |
-;  --------------------------------------------------------------
-;  --------------------------------------------------------------
-;  |    8    |                                                  |
-;  --------------------------------------------------------------
-;  |  020h   |                                                  |
-;  --------------------------------------------------------------
-;  |fc_execpt|                                                  |
-;  --------------------------------------------------------------
-;  --------------------------------------------------------------
-;  |    9    |                                                  |
-;  --------------------------------------------------------------
-;  |  024h   |                                                  |
-;  --------------------------------------------------------------
-;  |fc_strage|                                                  |
-;  --------------------------------------------------------------
-;  --------------------------------------------------------------
-;  |   10    |    11   |                                        |
-;  --------------------------------------------------------------
-;  |  028h   |   02ch  |                                        |
-;  --------------------------------------------------------------
-;  | fc_mxcsr|fc_x87_cw|                                        |
-;  --------------------------------------------------------------
-
-.386
-.XMM
-.model flat, c
-_exit PROTO, value:SDWORD 
-align_stack PROTO, vp:DWORD
-seh_fcontext PROTO, except:DWORD, frame:DWORD, context:DWORD, dispatch:DWORD
-.code
-
-jump_fcontext PROC EXPORT
-    mov     ecx,         [esp+04h]  ; load address of the first fcontext_t arg
-    mov     [ecx],       edi        ; save EDI
-    mov     [ecx+04h],   esi        ; save ESI
-    mov     [ecx+08h],   ebx        ; save EBX
-    mov     [ecx+0ch],   ebp        ; save EBP
-
-    assume  fs:nothing
-    mov     edx,         fs:[018h]  ; load NT_TIB
-    assume  fs:error
-    mov     eax,         [edx]      ; load current SEH exception list
-    mov     [ecx+020h],  eax        ; save current exception list
-    mov     eax,         [edx+04h]  ; load current stack base
-    mov     [ecx+018h],  eax        ; save current stack base
-    mov     eax,         [edx+08h]  ; load current stack limit
-    mov     [ecx+01ch],  eax        ; save current stack limit
-    mov     eax,         [edx+010h] ; load fiber local storage
-    mov     [ecx+024h],  eax        ; save fiber local storage
-
-    lea     eax,         [esp+04h]  ; exclude the return address
-    mov     [ecx+010h],  eax        ; save as stack pointer
-    mov     eax,         [esp]      ; load return address
-    mov     [ecx+014h],  eax        ; save return address
-
-    mov     edx,        [esp+08h]   ; load address of the second fcontext_t arg
-    mov     edi,        [edx]       ; restore EDI
-    mov     esi,        [edx+04h]   ; restore ESI
-    mov     ebx,        [edx+08h]   ; restore EBX
-    mov     ebp,        [edx+0ch]   ; restore EBP
-
-    mov     eax,        [esp+010h]  ; check if fpu enve preserving was requested
-    test    eax,        eax 
-    je      nxt
-
-    stmxcsr [ecx+028h]              ; save MMX control word
-    fnstcw  [ecx+02ch]              ; save x87 control word
-    ldmxcsr [edx+028h]              ; restore MMX control word
-    fldcw   [edx+02ch]              ; restore x87 control word
-nxt:
-    mov     ecx,        edx
-    assume  fs:nothing
-    mov     edx,        fs:[018h]   ; load NT_TIB
-    assume  fs:error
-    mov     eax,        [ecx+020h]  ; load SEH exception list
-    mov     [edx],      eax         ; restore next SEH item
-    mov     eax,        [ecx+018h]  ; load stack base
-    mov     [edx+04h],  eax         ; restore stack base
-    mov     eax,        [ecx+01ch]  ; load stack limit
-    mov     [edx+08h],  eax         ; restore stack limit
-    mov     eax,        [ecx+024h]  ; load fiber local storage
-    mov     [edx+010h], eax         ; restore fiber local storage
-
-    mov     eax,        [esp+0ch]   ; use third arg as return value after jump
-
-    mov     esp,        [ecx+010h]  ; restore ESP
-    mov     [esp+04h],  eax         ; use third arg as first arg in context function
-    mov     ecx,        [ecx+014h]  ; fetch the address to return to
-
-    jmp     ecx                     ; indirect jump to context
-jump_fcontext ENDP
-
-make_fcontext PROC EXPORT
-    mov  eax,         [esp+04h]     ; load address of the fcontext_t arg0
-    mov  [eax],       eax           ; save the address of passed context
-    mov  ecx,         [esp+08h]     ; load the address of the context function
-    mov  [eax+014h],  ecx           ; save the address of the context function
-    mov  edx,         [eax+018h]    ; load the stack base
-
-    push  eax                       ; save pointer to fcontext_t
-    push  edx                       ; stack pointer as arg for align_stack
-    call  align_stack               ; align stack
-    mov   edx,        eax           ; begin of aligned stack
-    pop   eax                       ; remove arg for align_stack
-    pop   eax                       ; restore pointer to fcontext_t
-
-    lea  edx,         [edx-014h]    ; reserve space for last frame on stack, (ESP + 4) & 15 == 0
-    mov  [eax+010h],  edx           ; save the aligned stack
-
-    mov  ecx,         seh_fcontext  ; set ECX to exception-handler
-    mov  [edx+0ch],   ecx           ; save ECX as SEH handler
-    mov  ecx,         0ffffffffh    ; set ECX to -1
-    mov  [edx+08h],   ecx           ; save ECX as next SEH item
-    lea  ecx,         [edx+08h]     ; load address of next SEH item
-    mov  [eax+02ch],  ecx           ; save next SEH
-
-    stmxcsr [eax+028h]              ; save MMX control word
-    fnstcw  [eax+02ch]              ; save x87 control word
-
-    mov  ecx,         finish        ; address of finish
-    mov  [edx],       ecx
-
-    xor  eax,         eax
-    ret
-
-finish:
-    xor   eax,        eax
-    push  eax                       ; exit code is zero
-    call  _exit                     ; exit application
-    hlt
-make_fcontext ENDP
-END
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_i386_sysv_elf_gas.S b/vendor/boost_1.51/libs/context/asm/fcontext_i386_sysv_elf_gas.S
deleted file mode 100644
index 7c94ea0..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_i386_sysv_elf_gas.S
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/********************************************************************
- *                                                                  *
- *  --------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
- *  --------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |  *
- *  --------------------------------------------------------------  *
- *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    6    |    7    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x18  |   0x1c  |                                        |  *
- *  --------------------------------------------------------------  *
- *  |  sbase  | slimit  |                                        |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    8    |    9    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x20  |   0x24  |                                        |  *
- *  --------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                        |  *
- *  --------------------------------------------------------------  *
- *                                                                  *
- * *****************************************************************/
-
-.text
-.globl jump_fcontext
-.align 2
-.type jump_fcontext,@function
-jump_fcontext:
-    movl    0x4(%esp), %ecx         /* load address of the first fcontext_t arg */
-    movl    %edi,       (%ecx)      /* save EDI */
-    movl    %esi,       0x4(%ecx)   /* save ESI */
-    movl    %ebx,       0x8(%ecx)   /* save EBX */
-    movl    %ebp,       0xc(%ecx)   /* save EBP */
-
-    leal    0x4(%esp),  %eax        /* exclude the return address */
-    movl    %eax,       0x10(%ecx)  /* save as stack pointer */
-    movl    (%esp),     %eax        /* load return address */
-    movl    %eax,       0x14(%ecx)  /* save return address */
-
-    movl    0x8(%esp),   %edx       /* load address of the second fcontext_t arg */
-    movl    (%edx),      %edi       /* restore EDI */
-    movl    0x4(%edx),   %esi       /* restore ESI */
-    movl    0x8(%edx),   %ebx       /* restore EBX */
-    movl    0xc(%edx),   %ebp       /* restore EBP */
-
-    movl    0x10(%esp),  %eax       /* check if fpu enve preserving was requested */
-    test    %eax,        %eax
-    je      1f
-
-    stmxcsr  0x20(%ecx)             /* save MMX control and status word */
-    fnstcw   0x24(%ecx)             /* save x87 control word */
-    ldmxcsr  0x20(%edx)             /* restore MMX control and status word */
-    fldcw    0x24(%edx)             /* restore x87 control word */
-1:
-    movl    0xc(%esp),   %eax       /* use third arg as return value after jump */
-
-    movl    0x10(%edx),  %esp       /* restore ESP */
-    movl    %eax,        0x4(%esp)  /* use third arg as first arg in context function */
-    movl    0x14(%edx),  %edx       /* fetch the address to return to */
-
-    jmp     *%edx                   /* indirect jump to context */
-.size jump_fcontext,.-jump_fcontext
-
-.text
-.globl make_fcontext
-.align 2
-.type make_fcontext,@function
-make_fcontext:
-    movl   0x4(%esp),      %eax         /* load address of the fcontext_t */
-    movl   %eax,           (%eax)       /* save the address of current context */
-    movl   0x8(%esp),      %ecx         /* load the address of the context function */
-    movl   %ecx,           0x14(%eax)   /* save the address of the context function */
-    movl   0x18(%eax),     %edx         /* load the stack base */
-
-    pushl  %eax                         /* save pointer to fcontext_t */
-    pushl  %ebx                         /* save EBX */
-    pushl  %edx                         /* stack pointer as arg for align_stack */
-    call   1f
-1:  popl   %ebx                         /* address of label 1 */
-    addl   $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx     /* compute address of GOT and store it in EBX */
-    call   align_stack@PLT              /* align stack */
-    movl   %eax,           %edx         /* begin of aligned stack */
-    popl   %eax                         /* remove arg for align_stack */
-    popl   %ebx                         /* restore EBX */
-    popl   %eax                         /* restore pointer to fcontext_t */
-
-    leal   -0x14(%edx),    %edx         /* reserve space for the last frame on stack, (ESP + 4) % 16 == 0 */
-    movl   %edx,           0x10(%eax)   /* save the aligned stack base */
-
-    stmxcsr  0x20(%eax)                 /* save MMX control and status word */
-    fnstcw   0x24(%eax)                 /* save x87 control word */
-
-    call    2f
-2:  popl    %ecx                        /* address of label 2 */
-    addl    $finish-2b, %ecx            /* helper code executed after context function returns */
-    movl    %ecx, (%edx)
-
-    xorl   %eax,            %eax
-    ret
-
-finish:
-    leal   -0xc(%esp),    %esp
-
-    call    3f
-3:  popl    %ebx                                    /* address of label 3 */
-    addl    $_GLOBAL_OFFSET_TABLE_+[.-3b], %ebx     /* compute address of GOT and store it in EBX */
-
-    xorl    %eax,           %eax
-    pushl   %eax                        /* exit code is zero */
-    call   _exit@PLT                    /* exit application */
-    hlt
-.size make_fcontext,.-make_fcontext
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_i386_sysv_macho_gas.S b/vendor/boost_1.51/libs/context/asm/fcontext_i386_sysv_macho_gas.S
deleted file mode 100644
index a28c875..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_i386_sysv_macho_gas.S
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/********************************************************************
- *                                                                  *
- *  --------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |  *
- *  --------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |  *
- *  --------------------------------------------------------------  *
- *  |   EDI   |   ESI   |   EBX   |   EBP   |   ESP    |   EIP   |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    6    |    7    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x18  |   0x1c  |                                        |  *
- *  --------------------------------------------------------------  *
- *  |  sbase  | slimit  |                                        |  *
- *  --------------------------------------------------------------  *
- *  --------------------------------------------------------------  *
- *  |    8    |    9    |                                        |  *
- *  --------------------------------------------------------------  *
- *  |   0x20  |   0x24  |                                        |  *
- *  --------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                        |  *
- *  --------------------------------------------------------------  *
- *                                                                  *
- * *****************************************************************/
-
-.text
-.globl _jump_fcontext
-.align 2
-_jump_fcontext:
-    movl    0x4(%esp), %ecx         /* load address of the first fcontext_t arg */
-    movl    %edi,       (%ecx)      /* save EDI */
-    movl    %esi,       0x4(%ecx)   /* save ESI */
-    movl    %ebx,       0x8(%ecx)   /* save EBX */
-    movl    %ebp,       0xc(%ecx)   /* save EBP */
-
-    leal    0x4(%esp),  %eax        /* exclude the return address */
-    movl    %eax,       0x10(%ecx)  /* save as stack pointer */
-    movl    (%esp),     %eax        /* load return address */
-    movl    %eax,       0x14(%ecx)  /* save return address */
-
-    movl    0x8(%esp),   %edx       /* load address of the second fcontext_t arg */
-    movl    (%edx),      %edi       /* restore EDI */
-    movl    0x4(%edx),   %esi       /* restore ESI */
-    movl    0x8(%edx),   %ebx       /* restore EBX */
-    movl    0xc(%edx),   %ebp       /* restore EBP */
-
-    movl    0x10(%esp),  %eax       /* check if fpu enve preserving was requested */
-    test    %eax,        %eax
-    je      1f
-
-    stmxcsr  0x20(%ecx)             /* save MMX control and status word */
-    fnstcw   0x24(%ecx)             /* save x87 control word */
-    ldmxcsr  0x20(%edx)             /* restore MMX control and status word */
-    fldcw    0x24(%edx)             /* restore x87 control word */
-1:
-    movl    0xc(%esp),   %eax       /* use third arg as return value after jump */
-
-    movl    0x10(%edx),  %esp       /* restore ESP */
-    movl    %eax,        0x4(%esp)  /* use third arg as first arg in context function */
-    movl    0x14(%edx),  %edx       /* fetch the address to return to */
-
-    jmp     *%edx                   /* indirect jump to context */
-
-.text
-.globl _make_fcontext
-.align 2
-_make_fcontext:
-    movl   0x4(%esp),      %eax         /* load address of the fcontext_t */
-    movl   %eax,           (%eax)       /* save the address of current context */
-    movl   0x8(%esp),      %ecx         /* load the address of the context function */
-    movl   %ecx,           0x14(%eax)   /* save the address of the context function */
-    movl   0x18(%eax),     %edx         /* load the stack base */
-
-    pushl  %eax                         /* save pointer to fcontext_t */
-    pushl  %ebx                         /* save EBX */
-    pushl  %edx                         /* stack pointer as arg for align_stack */
-    call   1f
-1:  popl   %ebx                         /* address of label 1 */
-    addl   $_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx     /* compute address of GOT and store it in EBX */
-    call   align_stack@PLT              /* align stack */
-    movl   %eax,           %edx         /* begin of aligned stack */
-    popl   %eax                         /* remove arg for align_stack */
-    popl   %ebx                         /* restore EBX */
-    popl   %eax                         /* restore pointer to fcontext_t */
-
-    leal   -0x14(%edx),    %edx         /* reserve space for the last frame on stack, (ESP + 4) % 16 == 0 */
-    movl   %edx,           0x10(%eax)   /* save the aligned stack base */
-
-    stmxcsr  0x20(%eax)                 /* save MMX control and status word */
-    fnstcw   0x24(%eax)                 /* save x87 control word */
-
-    call    2f
-2:  popl    %ecx                        /* address of label 2 */
-    addl    $finish-2b, %ecx            /* helper code executed after context function returns */
-    movl    %ecx, (%edx)
-
-    xorl   %eax,            %eax
-    ret
-
-finish:
-    leal   -0xc(%esp),    %esp
-
-    call    3f
-3:  popl    %ebx                                    /* address of label 3 */
-    addl    $_GLOBAL_OFFSET_TABLE_+[.-3b], %ebx     /* compute address of GOT and store it in EBX */
-
-    xorl    %eax,           %eax
-    pushl   %eax                        /* exit code is zero */
-    call   _exit@PLT                    /* exit application */
-    hlt
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_mips32_o32_elf_gas.S b/vendor/boost_1.51/libs/context/asm/fcontext_mips32_o32_elf_gas.S
deleted file mode 100644
index be86f18..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_mips32_o32_elf_gas.S
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/*******************************************************************
- *                                                                 *
- *  -------------------------------------------------------------  *
- *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  *
- *  -------------------------------------------------------------  *
- *  |  0  |  8  |  16 |  24 |  32 |  40 |  48 |  56 |  64 |  72 |  *
- *  -------------------------------------------------------------  *
- *  |  S0 |  S1 |  S2 |  S3 |  S4 |  S5 |  S6 |  S7 |  GP |  SP |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  10 |  11 |  12 |                                         |  *
- *  -------------------------------------------------------------  *
- *  |  80 |  88 |  96 |                                         |  *
- *  -------------------------------------------------------------  *
- *  |  S8 |  RA |  PC |                                         |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  13 |  14 |                                               |  *
- *  -------------------------------------------------------------  *
- *  | 104 | 112 |                                               |  *
- *  -------------------------------------------------------------  *
- *  |sbase|slimt|                                               |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  15 |  16 |  17 |  18 |  19 |  20 |                       |  *
- *  -------------------------------------------------------------  *
- *  | 120 | 128 | 136 | 144 | 152 | 160 |                       |  *
- *  -------------------------------------------------------------  *
- *  | F20 | F22 | F24 | F26 | F28 | F30 |                       |  *
- *  -------------------------------------------------------------  *
- *                                                                 *
- * *****************************************************************/
-
-.text
-.globl jump_fcontext
-.align 2
-.type jump_fcontext,@function
-.ent jump_fcontext
-jump_fcontext:
-    sw      $s0, ($a0)      # save S0
-    sw      $s1, 8($a0)     # save S1
-    sw      $s2, 16($a0)    # save S2
-    sw      $s3, 24($a0)    # save S3
-    sw      $s4, 32($a0)    # save S4
-    sw      $s5, 40($a0)    # save S5
-    sw      $s6, 48($a0)    # save S6
-    sw      $s7, 56($a0)    # save S7
-    sw      $gp, 64($a0)    # save GP
-    sw      $sp, 72($a0)    # save SP
-    sw      $s8, 80($a0)    # save S8
-    sw      $ra, 88($a0)    # save RA
-    sw      $ra, 96($a0)    # save RA as PC
-
-#if defined(__mips_hard_float)
-    beqz    $a3,  1f        # test if fpu env should be preserved 
-    s.d     $f20, 120($a0)  # save F20
-    s.d     $f22, 128($a0)  # save F22
-    s.d     $f24, 136($a0)  # save F24
-    s.d     $f26, 144($a0)  # save F26
-    s.d     $f28, 152($a0)  # save F28
-    s.d     $f30, 160($a0)  # save F30
-
-    l.d     $f20, 120($a1)  # restore F20
-    l.d     $f22, 128($a1)  # restore F22
-    l.d     $f24, 136($a1)  # restore F24
-    l.d     $f26, 144($a1)  # restore F26
-    l.d     $f28, 152($a1)  # restore F28
-    l.d     $f30, 160($a1)  # restore F30
-1:
-#endif
-
-    lw      $s0, ($a1)      # restore S0
-    lw      $s1, 8($a1)     # restore S1
-    lw      $s2, 16($a1)    # restore S2
-    lw      $s3, 24($a1)    # restore S3
-    lw      $s4, 32($a1)    # restore S4
-    lw      $s5, 40($a1)    # restore S5
-    lw      $s6, 48($a1)    # restore S6
-    lw      $s7, 56($a1)    # restore S7
-    lw      $gp, 64($a1)    # restore GP
-    lw      $sp, 72($a1)    # restore SP
-    lw      $s8, 80($a1)    # restore S8
-    lw      $ra, 88($a1)    # restore RA
-    move    $a0, $s2        # restore void pointer as argument
-
-    move    $v0, $a2        # use third arg as return value after jump
-    move    $a0, $a2        # use third arg as first arg in context function
-
-    lw      $t9, 96($a1)    # load PC
-    jr      $t9             # jump to context
-.end jump_fcontext
-.size jump_fcontext, .-jump_fcontext
-
-.text
-.globl make_fcontext
-.align 2
-.type make_fcontext,@function
-.ent make_fcontext
-make_fcontext:
-#ifdef __PIC__
-.set    noreorder
-.cpload $t9
-.set    reorder
-#endif
-    sw      $a0, ($a0)          # save the current context
-    sw      $gp, 24($a0)        # save global pointer
-    sw      $a1, 96($a0)        # save the address of the context function
-    lw      $t0, 104($a0)       # load the stack base
-
-    sub     $sp, $sp, 28
-    sw      $ra, 24($sp)
-    sw      $a0, 20($sp)
-    move    $a0, $t0            # stack pointer as arg for align_stack
-    lw      $t9, %call16(align_stack)($gp) # align stack
-    jalr    $t9
-    nop
-    move    $t0, $v0            # begin of aligned stack 
-    lw      $ra, 24($sp)
-    lw      $a0, 20($sp)
-    addi    $sp, $sp, 28
-
-    sub     $t0, $t0, 16        # reserve 16 byte of argument space
-    sw      $t0, 72($a0)        # save the algned stack base
-
-    la      $t9, finish         # helper code executed after context function returns
-    sw      $t9, 88($a0)
-
-    move    $v0, $zero
-    jr      $ra
-
-finish:
-    move    $gp, $s3            # restore GP (global pointer)
-    move    $a0, $zero          # exit code is zero
-    lw      $t9, %call16(_exit)($gp)  # exit application
-    jalr    $t9
-.end make_fcontext
-.size make_fcontext, .-make_fcontext
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_ppc32_sysv_elf_gas.S b/vendor/boost_1.51/libs/context/asm/fcontext_ppc32_sysv_elf_gas.S
deleted file mode 100644
index 69b6ed9..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_ppc32_sysv_elf_gas.S
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/*******************************************************************
- *                                                                 *
- *  -------------------------------------------------------------  *
- *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  *
- *  -------------------------------------------------------------  *
- *  |  0  |  4  |  8  |  12 |  16 |  20 |  24 |  28 |  32 |  36 |  *
- *  -------------------------------------------------------------  *
- *  | R13 | R14 | R15 | R16 | R17 | R18 | R19 | R20 | R21 | R22 |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  10 |  11 |  12 |  13 |  14 |  15 |  16 |  17 |  18 |  19 |  *
- *  -------------------------------------------------------------  *
- *  |  40 |  44 |  48 |  52 |  56 |  60 |  64 |  68 |  72 |  76 |  *
- *  -------------------------------------------------------------  *
- *  | R23 | R24 | R25 | R26 | R27 | R28 | R29 | R30 | R31 |  SP |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  20 |  21 |  22 |                                         |  *
- *  -------------------------------------------------------------  *
- *  |  80 |  84 |  88 |                                         |  *
- *  -------------------------------------------------------------  *
- *  |  CR |  LR |  PC |                                         |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  23 |  24 |                                               |  *
- *  -------------------------------------------------------------  *
- *  |  92 |  96 |                                               |  *
- *  -------------------------------------------------------------  *
- *  |sbase|slimt|                                               |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  25 |  26 |  27 |  28 |  29 |  30 |  31 |  32 |  33 |  34 |  *
- *  -------------------------------------------------------------  *
- *  | 100 | 104 | 108 | 112 | 116 | 120 | 124 | 128 | 132 | 136 |  *
- *  -------------------------------------------------------------  *
- *  |    F14    |    F15    |    F16    |    F17    |    F18    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  35 |  36 |  37 |  38 |  39 |  40 |  41 |  42 |  43 |  44 |  *
- *  -------------------------------------------------------------  *
- *  | 140 | 144 | 148 | 152 | 156 | 160 | 164 | 168 | 172 | 176 |  *
- *  -------------------------------------------------------------  *
- *  |    F19    |    F20    |    F21    |    F22    |    F23    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  45 |  46 |  47 |  48 |  49 |  50 |  51 |  52 |  53 |  54 |  *
- *  -------------------------------------------------------------  *
- *  | 180 | 184 | 188 | 192 | 196 | 200 | 204 | 208 | 212 | 216 |  *
- *  -------------------------------------------------------------  *
- *  |    F24    |    F25    |    F26    |    F27    |    F28    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  55 |  56 |  57 |  58 |  59 |  60 |  61 |  62 |           |  *
- *  -------------------------------------------------------------  *
- *  | 220 | 224 | 228 | 232 | 236 | 240 | 244 | 248 |           |  *
- *  -------------------------------------------------------------  *
- *  |    F29    |    F30    |    F31    |   fpscr   |           |  *
- *  -------------------------------------------------------------  *
- *                                                                 *
- * *****************************************************************/
-
-.text
-.globl jump_fcontext
-.align 2
-.type jump_fcontext,@function
-jump_fcontext:
-    stw     %r13,  0(%r3)       # save R13
-    stw     %r14,  4(%r3)       # save R14
-    stw     %r15,  8(%r3)       # save R15
-    stw     %r16,  12(%r3)      # save R16
-    stw     %r17,  16(%r3)      # save R17
-    stw     %r18,  20(%r3)      # save R18
-    stw     %r19,  24(%r3)      # save R19
-    stw     %r20,  28(%r3)      # save R20
-    stw     %r21,  32(%r3)      # save R21
-    stw     %r22,  36(%r3)      # save R22
-    stw     %r23,  40(%r3)      # save R23
-    stw     %r24,  44(%r3)      # save R24
-    stw     %r25,  48(%r3)      # save R25
-    stw     %r26,  52(%r3)      # save R26
-    stw     %r27,  56(%r3)      # save R27
-    stw     %r28,  60(%r3)      # save R28
-    stw     %r29,  64(%r3)      # save R29
-    stw     %r30,  68(%r3)      # save R30
-    stw     %r31,  72(%r3)      # save R31
-    stw     %r1,   76(%r3)      # save SP
-
-    mfcr    %r0                 # load CR
-    stw     %r0,   80(%r3)      # save CR
-    mflr    %r0                 # load LR
-    stw     %r0,   84(%r3)      # save LR
-    stw     %r0,   88(%r3)      # save LR as PC
-
-    cmpwi   cr7,   %r6,  0      # test if fpu env should be preserved
-    beq     cr7,   1f
-
-    stfd    %f14,  100(%r3)     # save F14
-    stfd    %f15,  108(%r3)     # save F15
-    stfd    %f16,  116(%r3)     # save F16
-    stfd    %f17,  124(%r3)     # save F17
-    stfd    %f18,  132(%r3)     # save F18
-    stfd    %f19,  140(%r3)     # save F19
-    stfd    %f20,  148(%r3)     # save F20
-    stfd    %f21,  156(%r3)     # save F21
-    stfd    %f22,  164(%r3)     # save F22
-    stfd    %f23,  172(%r3)     # save F23
-    stfd    %f24,  180(%r3)     # save F24
-    stfd    %f25,  188(%r3)     # save F25
-    stfd    %f26,  196(%r3)     # save F26
-    stfd    %f27,  204(%r3)     # save F27
-    stfd    %f28,  212(%r3)     # save F28
-    stfd    %f29,  220(%r3)     # save F29
-    stfd    %f30,  228(%r3)     # save F30
-    stfd    %f31,  236(%r3)     # save F31
-    mffs    %f0                 # load FPSCR
-    stfd    %f0,   244(%r3)     # save FPSCR
-
-    lfd     %f14,  100(%r4)     # restore F14
-    lfd     %f15,  108(%r4)     # restore F15
-    lfd     %f16,  116(%r4)     # restore F16
-    lfd     %f17,  124(%r4)     # restore F17
-    lfd     %f18,  132(%r4)     # restore F18
-    lfd     %f19,  140(%r4)     # restore F19
-    lfd     %f20,  148(%r4)     # restore F20
-    lfd     %f21,  156(%r4)     # restore F21
-    lfd     %f22,  164(%r4)     # restore F22
-    lfd     %f23,  172(%r4)     # restore F23
-    lfd     %f24,  180(%r4)     # restore F24
-    lfd     %f25,  188(%r4)     # restore F25
-    lfd     %f26,  196(%r4)     # restore F26
-    lfd     %f27,  204(%r4)     # restore F27
-    lfd     %f28,  212(%r4)     # restore F28
-    lfd     %f29,  220(%r4)     # restore F29
-    lfd     %f30,  228(%r4)     # restore F30
-    lfd     %f31,  236(%r4)     # restore F31
-    lfd     %f0,   244(%r4)     # load FPSCR
-    mtfsf   0xff,  %f0          # restore FPSCR
-1:
-
-    lwz     %r13,  0(%r4)       # restore R13
-    lwz     %r14,  4(%r4)       # restore R14
-    lwz     %r15,  8(%r4)       # restore R15
-    lwz     %r16,  12(%r4)      # restore R16
-    lwz     %r17,  16(%r4)      # restore R17
-    lwz     %r18,  20(%r4)      # restore R18
-    lwz     %r19,  24(%r4)      # restore R19
-    lwz     %r20,  28(%r4)      # restore R20
-    lwz     %r21,  32(%r4)      # restore R21
-    lwz     %r22,  36(%r4)      # restore R22
-    lwz     %r23,  40(%r4)      # restore R23
-    lwz     %r24,  44(%r4)      # restore R24
-    lwz     %r25,  48(%r4)      # restore R25
-    lwz     %r26,  52(%r4)      # restore R26
-    lwz     %r27,  56(%r4)      # restore R27
-    lwz     %r28,  60(%r4)      # restore R28
-    lwz     %r29,  64(%r4)      # restore R29
-    lwz     %r30,  68(%r4)      # restore R30
-    lwz     %r31,  72(%r4)      # restore R31
-    lwz     %r1,   76(%r4)      # restore SP
-
-    lwz     %r0,   80(%r4)      # load CR
-    mtcr    %r0                 # restore CR
-    lwz     %r0,   84(%r4)      # load LR
-    mtlr    %r0                 # restore LR
-
-    mr.     %r3,   %r5          # use third arg as return value after jump
-                                # and as first arg in context function
-
-    lwz     %r0,   88(%r4)      # load PC
-    mtctr   %r0                 # restore CTR
-
-    bctr                        # jump to context
-.size jump_fcontext, .-jump_fcontext
-
-.text
-.globl make_fcontext
-.align 2
-.type make_fcontext,@function
-make_fcontext:
-    stw     %r3, 0(%r3)         # save the current context
-    stw     %r4, 88(%r3)        # save the address of the context function
-    lwz     %r0, 92(%r3)        # load the stack base
-
-    li      %r4, 28
-    subf    %r1, %r4, %r1       # reserve space on stack
-    stw     %r3, 24(%r1)        # store pointer to fcontext_t on stack
-    mflr    %r4                 # load LR
-    stw     %r4, 20(%r1)        # store LR on stack
-    mr.     %r3, %r0            # context stack as arg to align_stack
-    bl      align_stack@plt     # call align_stack
-    mr.     %r0, %r3            # load result into R0
-    lwz     %r4, 20(%r1)        # pop LR from stack
-    mtlr    %r4                 # restore LR
-    lwz     %r3, 24(%r1)        # pop pointer to fcontext_t from stack
-    addi    %r1, %r1, 28        # release space on stack
-
-    li      %r4, 32
-    subf    %r0, %r4, %r0       # 32 bytes on stack for parameter area(== 8 registers)
-    stw     %r0, 76(%r3)        # save the aligned stack base
-
-    mflr    %r0                 # load LR
-    bl      1f                  # jump to label 1
-1:
-    mflr    %r4                 # load LR
-    addi    %r4, %r4, finish - 1b    # address of finish; called after context function returns
-    mtlr    %r0                 # restore LR
-    stw     %r4, 84(%r3)
-
-    li      %r3,  0
-    blr
-
-finish:
-    li      %r3,  0             # exit code is zero
-    bl      _exit@plt           # exit application
-.size make_fcontext, .-make_fcontext
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_ppc64_sysv_elf_gas.S b/vendor/boost_1.51/libs/context/asm/fcontext_ppc64_sysv_elf_gas.S
deleted file mode 100644
index 0fcb387..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_ppc64_sysv_elf_gas.S
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-          http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/*******************************************************************
- *                                                                 *
- *  -------------------------------------------------------------  *
- *  |  0  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  *
- *  -------------------------------------------------------------  *
- *  |  0  |  4  |   8 |  12 |  16 |  20 |  24 |  28 |  32 |  36 |  *
- *  -------------------------------------------------------------  *
- *  |    R13    |    R14    |    R15    |    R16    |    R17    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  10 |  11 |  12 |  13 |  14 |  15 |  16 |  17 |  18 |  19 |  *
- *  -------------------------------------------------------------  *
- *  |  40 |  44 |  48 |  52 |  56 |  60 |  64 |  68 |  72 |  76 |  *
- *  -------------------------------------------------------------  *
- *  |    R18    |    R19    |    R20    |    R21    |    R22    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  20 |  21 |  22 |  23 |  24 |  25 |  26 |  27 |  28 |  29 |  *
- *  -------------------------------------------------------------  *
- *  |  80 |  84 |  88 |  92 |  96 | 100 | 104 | 108 | 112 | 116 |  *
- *  -------------------------------------------------------------  *
- *  |    R23    |    R24    |    R25    |    R26    |    R27    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  30 |  31 |  32 |  33 |  34 |  35 |  36 |  37 |  38 |  39 |  *
- *  -------------------------------------------------------------  *
- *  | 120 | 124 | 128 | 132 | 136 | 140 | 144 | 148 | 152 | 156 |  *
- *  -------------------------------------------------------------  *
- *  |    R28    |    R29    |    R30    |    R31    |     SP    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  40 |  41 |  42 |  43 |  44 |  45 |                       |  *
- *  -------------------------------------------------------------  *
- *  | 160 | 164 | 168 | 172 | 176 | 180 |                       |  *
- *  -------------------------------------------------------------  *
- *  |    CR     |    LR     |     PC    |                       |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  46 |  47 |  48 |  49 |                                   |  *
- *  -------------------------------------------------------------  *
- *  | 184 | 188 | 192 | 196 |                                   |  *
- *  -------------------------------------------------------------  *
- *  |   sbase   |   slimt   |                                   |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  50 |  51 |  52 |  53 |  54 |  55 |  56 |  57 |  58 |  59 |  *
- *  -------------------------------------------------------------  *
- *  | 200 | 204 | 208 | 212 | 216 | 220 | 224 | 228 | 232 | 236 |  *
- *  -------------------------------------------------------------  *
- *  |    F14    |    F15    |    F16    |    F17    |    F18    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  60 |  61 |  62 |  63 |  64 |  65 |  66 |  67 |  68 |  69 |  *
- *  -------------------------------------------------------------  *
- *  | 240 | 244 | 248 | 252 | 256 | 260 | 264 | 268 | 272 | 276 |  *
- *  -------------------------------------------------------------  *
- *  |    F19    |    F20    |    F21    |    F22    |    F23    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  70 |  71 |  72 |  73 |  74 |  75 |  76 |  77 |  78 |  79 |  *
- *  -------------------------------------------------------------  *
- *  | 280 | 284 | 288 | 292 | 296 | 300 | 304 | 308 | 312 | 316 |  *
- *  -------------------------------------------------------------  *
- *  |    F24    |    F25    |    F26    |    F27    |    F28    |  *
- *  -------------------------------------------------------------  *
- *  -------------------------------------------------------------  *
- *  |  80 |  81 |  82 |  83 |  84 |  85 |  86 |  87 |           |  *
- *  -------------------------------------------------------------  *
- *  | 320 | 324 | 328 | 332 | 336 | 340 | 344 | 348 |           |  *
- *  -------------------------------------------------------------  *
- *  |    F29    |    F30    |    F31    |   fpscr   |           |  *
- *  -------------------------------------------------------------  *
- *                                                                 *
- * *****************************************************************/
-
-.section ".text"
-.align 2
-.globl jump_fcontext
-.section ".opd","aw"
-.align 3
-jump_fcontext:
-.quad .jump_fcontext,.TOC.@tocbase,0
-.previous
-.size jump_fcontext,24
-.type .jump_fcontext,@function
-.globl .jump_fcontext
-.jump_fcontext:
-    std     %r13,  0(%r3)       # save R13
-    std     %r14,  8(%r3)       # save R14
-    std     %r15,  16(%r3)      # save R15
-    std     %r16,  24(%r3)      # save R16
-    std     %r17,  32(%r3)      # save R17
-    std     %r18,  40(%r3)      # save R18
-    std     %r19,  48(%r3)      # save R19
-    std     %r20,  56(%r3)      # save R20
-    std     %r21,  64(%r3)      # save R21
-    std     %r22,  72(%r3)      # save R22
-    std     %r23,  80(%r3)      # save R23
-    std     %r24,  88(%r3)      # save R24
-    std     %r25,  96(%r3)      # save R25
-    std     %r26,  104(%r3)     # save R26
-    std     %r27,  112(%r3)     # save R27
-    std     %r28,  120(%r3)     # save R28
-    std     %r29,  128(%r3)     # save R29
-    std     %r30,  136(%r3)     # save R30
-    std     %r31,  144(%r3)     # save R31
-    std     %r1,   152(%r3)     # save SP
-
-    mfcr    %r0                 # load CR
-    std     %r0,   160(%r3)     # save CR
-    mflr    %r0                 # load LR
-    std     %r0,   168(%r3)     # save LR
-    std     %r0,   176(%r3)     # save LR as PC
-
-    cmpwi   cr7,   %r6,  0      # test if fpu env should be preserved
-    beq     cr7,   1f
-
-    stfd    %f14,  200(%r3)     # save F14
-    stfd    %f15,  208(%r3)     # save F15
-    stfd    %f16,  216(%r3)     # save F16
-    stfd    %f17,  224(%r3)     # save F17
-    stfd    %f18,  232(%r3)     # save F18
-    stfd    %f19,  240(%r3)     # save F19
-    stfd    %f20,  248(%r3)     # save F20
-    stfd    %f21,  256(%r3)     # save F21
-    stfd    %f22,  264(%r3)     # save F22
-    stfd    %f23,  272(%r3)     # save F23
-    stfd    %f24,  280(%r3)     # save F24
-    stfd    %f25,  288(%r3)     # save F25
-    stfd    %f26,  296(%r3)     # save F26
-    stfd    %f27,  304(%r3)     # save F27
-    stfd    %f28,  312(%r3)     # save F28
-    stfd    %f29,  320(%r3)     # save F29
-    stfd    %f30,  328(%r3)     # save F30
-    stfd    %f31,  336(%r3)     # save F31
-    mffs    %f0                 # load FPSCR
-    stfd    %f0,   344(%r3)     # save FPSCR
-
-    lfd     %f14,  200(%r4)     # restore F14
-    lfd     %f15,  208(%r4)     # restore F15
-    lfd     %f16,  216(%r4)     # restore F16
-    lfd     %f17,  224(%r4)     # restore F17
-    lfd     %f18,  232(%r4)     # restore F18
-    lfd     %f19,  240(%r4)     # restore F19
-    lfd     %f20,  248(%r4)     # restore F20
-    lfd     %f21,  256(%r4)     # restore F21
-    lfd     %f22,  264(%r4)     # restore F22
-    lfd     %f23,  272(%r4)     # restore F23
-    lfd     %f24,  280(%r4)     # restore F24
-    lfd     %f25,  288(%r4)     # restore F25
-    lfd     %f26,  296(%r4)     # restore F26
-    lfd     %f27,  304(%r4)     # restore F27
-    lfd     %f28,  312(%r4)     # restore F28
-    lfd     %f29,  320(%r4)     # restore F29
-    lfd     %f30,  328(%r4)     # restore F30
-    lfd     %f31,  336(%r4)     # restore F31
-    lfd     %f0,   344(%r4)     # load FPSCR
-    mtfsf   0xff,  %f0          # restore FPSCR
-1:
-
-    ld      %r13,  0(%r4)       # restore R13
-    ld      %r14,  8(%r4)       # restore R14
-    ld      %r15,  16(%r4)      # restore R15
-    ld      %r16,  24(%r4)      # restore R16
-    ld      %r17,  32(%r4)      # restore R17
-    ld      %r18,  40(%r4)      # restore R18
-    ld      %r19,  48(%r4)      # restore R19
-    ld      %r20,  56(%r4)      # restore R20
-    ld      %r21,  64(%r4)      # restore R21
-    ld      %r22,  72(%r4)      # restore R22
-    ld      %r23,  80(%r4)      # restore R23
-    ld      %r24,  88(%r4)      # restore R24
-    ld      %r25,  96(%r4)      # restore R25
-    ld      %r26,  104(%r4)     # restore R26
-    ld      %r27,  112(%r4)     # restore R27
-    ld      %r28,  120(%r4)     # restore R28
-    ld      %r29,  128(%r4)     # restore R29
-    ld      %r30,  136(%r4)     # restore r30
-    ld      %r31,  144(%r4)     # restore r31
-    ld      %r1,   152(%r4)     # restore SP
-
-    ld      %r0,   160(%r4)     # load CR
-    mtcr    %r0                 # restore CR
-    ld      %r0,   168(%r4)     # load LR
-    mtlr    %r0                 # restore LR
-
-    mr.     %r3,   %r5          # use third arg as return value after jump
-                                # and as first arg in context function
-
-    ld      %r0,   176(%r4)     # load PC
-    mtctr   %r0                 # restore CTR
-
-    bctr                        # jump to context
-.size .jump_fcontext, .-.jump_fcontext
-
-.section ".text"
-.align 2
-.globl make_fcontext
-.section ".opd","aw"
-.align 3
-make_fcontext:
-.quad .make_fcontext,.TOC.@tocbase,0
-.previous
-.size make_fcontext,24
-.type .make_fcontext,@function
-.globl .make_fcontext
-.make_fcontext:
-    std     %r3, 0(%r3)         # save the current context
-    std     %r4, 176(%r3)       # save the address of the function supposed to be run
-    ld      %r0, 184(%r3)       # load the stack base
-
-    li      %r4, 56
-    subf    %r1, %r4, %r1       # reserve space on stack
-    stw     %r3, 48(%r1)        # store pointer to fcontext_t on stack
-    mflr    %r4                 # load LR
-    stw     %r4, 40(%r1)        # store LR on stack
-    mr.     %r3, %r0            # context stack as arg to align_stack
-    bl      align_stack@plt     # call align_stack
-    mr.     %r0, %r3            # load result into R0
-    lwz     %r4, 40(%r1)        # pop LR from stack
-    mtlr    %r4                 # restore LR
-    lwz     %r3, 48(%r1)        # pop pointer to fcontext_t from stack
-    addi    %r1, %r1, 56        # release space on stack
-
-    li      %r4, 64
-    subf    %r0, %r4, %r0       # 64 bytes on stack for parameter area (== 8 registers)
-    std     %r0, 152(%r3)       # save the stack base
-
-    mflr    %r0                 # load LR
-    bl      1f                  # jump to label 1
-1:
-    mflr    %r4                 # load LR
-    addi    %r4, %r4, finish - 1b    # calulate absolute address of finish
-    mtlr    %r0                 # restore LR
-    std     %r4, 168(%r3)       # save address of finish
-
-    li      %r3,  0             # set return value to zero
-    blr
-
-finish:
-    li      %r3,  0             # set return value to zero
-    bl      _exit@plt           # exit application
-.size .make_fcontext, .-.make_fcontext
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_ms_pe_masm.asm b/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_ms_pe_masm.asm
deleted file mode 100644
index f1f8ca1..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_ms_pe_masm.asm
+++ /dev/null
@@ -1,207 +0,0 @@
-
-;           Copyright Oliver Kowalke 2009.
-;  Distributed under the Boost Software License, Version 1.0.
-;     (See accompanying file LICENSE_1_0.txt or copy at
-;           http://www.boost.org/LICENSE_1_0.txt)
-
-;  ----------------------------------------------------------------------------------
-;  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |
-;  ----------------------------------------------------------------------------------
-;  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |
-;  ----------------------------------------------------------------------------------
-;  |        R12        |         R13       |         R14        |        R15        |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |
-;  ----------------------------------------------------------------------------------
-;  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |
-;  ----------------------------------------------------------------------------------
-;  |        RDI        |        RSI        |         RBX        |        RBP        |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |    16   |    17   |    18   |    19   |                                        |
-;  ----------------------------------------------------------------------------------
-;  |   0x40  |   0x44  |   0x48  |   0x4c  |                                        |
-;  ----------------------------------------------------------------------------------
-;  |        RSP        |       RIP         |                                        |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |    20   |    21   |    22   |    23   |                                        |
-;  ----------------------------------------------------------------------------------
-;  |   0x50  |   0x54  |   0x58  |   0x5c  |                                        |
-;  ----------------------------------------------------------------------------------
-;  |       sbase       |       slimit      |                                        |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |    24   |   25    |                                                            |
-;  ----------------------------------------------------------------------------------
-;  |   0x60  |   0x64  |                                                            |
-;  ----------------------------------------------------------------------------------
-;  |      fbr_strg     |                                                            |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |    26   |   27    |    28   |    29   |                                        |
-;  ----------------------------------------------------------------------------------
-;  |   0x68  |   0x6c  |   0x70  |   0x74  |                                        |
-;  ----------------------------------------------------------------------------------
-;  | fc_mxcsr|fc_x87_cw|       fc_xmm      |                                        |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |   30    |   31    |    32    |   33   |   34    |   35    |   36     |   37    |
-;  ----------------------------------------------------------------------------------
-;  |  0x78   |  0x7c   |   0x80   |  0x84  |  0x88   |  0x8c   |   0x90   |   0x94  |
-;  ----------------------------------------------------------------------------------
-;  |                  XMM6                 |                   XMM7                 |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |   38    |   39    |    40    |   41   |   42    |   43    |    44    |   45    |
-;  ----------------------------------------------------------------------------------
-;  |  0x98   |  0x9c   |  0x100  |  0x104  |  0x108  |  0x10c  |   0x110  |  0x114  |
-;  ----------------------------------------------------------------------------------
-;  |                  XMM8                 |                   XMM9                 |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |   46    |   47    |    48    |   49   |   50    |   51    |    52    |   53    |
-;  ----------------------------------------------------------------------------------
-;  |  0x118  |  0x11c  |  0x120  |  0x124  |  0x128  |  0x12c  |   0x130  |  0x134  |
-;  ----------------------------------------------------------------------------------
-;  |                 XMM10                 |                  XMM11                 |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |   54    |   55    |    56    |   57   |   58    |   59    |    60    |   61    |
-;  ----------------------------------------------------------------------------------
-;  |  0x138  |  0x13c  |  0x140  |  0x144  |  0x148  |  0x14c  |   0x150  |  0x154  |
-;  ----------------------------------------------------------------------------------
-;  |                 XMM12                 |                  XMM13                 |
-;  ----------------------------------------------------------------------------------
-;  ----------------------------------------------------------------------------------
-;  |   62    |   63    |    64    |   65   |   66    |   67    |    68    |   69    |
-;  ----------------------------------------------------------------------------------
-;  |  0x158  |  0x15c  |  0x160  |  0x164  |  0x168  |  0x16c  |   0x170  |  0x174  |
-;  ----------------------------------------------------------------------------------
-;  |                 XMM14                 |                  XMM15                 |
-;  ----------------------------------------------------------------------------------
-
-EXTERN  _exit:PROC            ; standard C library function
-EXTERN  align_stack:PROC      ; stack alignment
-EXTERN  seh_fcontext:PROC     ; exception handler
-.code
-
-jump_fcontext PROC EXPORT FRAME:seh_fcontext
-    .endprolog
-
-    mov     [rcx],       r12        ; save R12
-    mov     [rcx+08h],   r13        ; save R13
-    mov     [rcx+010h],  r14        ; save R14
-    mov     [rcx+018h],  r15        ; save R15
-    mov     [rcx+020h],  rdi        ; save RDI
-    mov     [rcx+028h],  rsi        ; save RSI
-    mov     [rcx+030h],  rbx        ; save RBX
-    mov     [rcx+038h],  rbp        ; save RBP
-
-    mov     r10,         gs:[030h]  ; load NT_TIB
-    mov     rax,         [r10+08h]  ; load current stack base
-    mov     [rcx+050h],  rax        ; save current stack base
-    mov     rax,         [r10+010h] ; load current stack limit
-    mov     [rcx+058h],  rax        ; save current stack limit
-    mov     rax,         [r10+018h] ; load fiber local storage
-    mov     [rcx+060h],  rax        ; save fiber local storage
-
-    test    r9,          r9
-    je      nxt
-
-    stmxcsr [rcx+068h]              ; save MMX control and status word
-    fnstcw  [rcx+06ch]              ; save x87 control word
-    mov     r10,         [rcx+070h] ; address of aligned XMM storage
-    movaps  [r10],       xmm6
-    movaps  [r10+010h],  xmm7
-    movaps  [r10+020h],  xmm8
-    movaps  [r10+030h],  xmm9
-    movaps  [r10+040h],  xmm10
-    movaps  [r10+050h],  xmm11
-    movaps  [r10+060h],  xmm12
-    movaps  [r10+070h],  xmm13
-    movaps  [r10+080h],  xmm14
-    movaps  [r10+090h],  xmm15
-
-    ldmxcsr [rdx+068h]              ; restore MMX control and status word
-    fldcw   [rdx+06ch]              ; restore x87 control word
-    mov     r10,         [rdx+070h] ; address of aligned XMM storage
-    movaps  xmm6,        [r10]
-    movaps  xmm7,        [r10+010h]
-    movaps  xmm8,        [r10+020h]
-    movaps  xmm9,        [r10+030h]
-    movaps  xmm10,       [r10+040h]
-    movaps  xmm11,       [r10+050h]
-    movaps  xmm12,       [r10+060h]
-    movaps  xmm13,       [r10+070h]
-    movaps  xmm14,       [r10+080h]
-    movaps  xmm15,       [r10+090h]
-nxt:
-
-    lea     rax,         [rsp+08h]  ; exclude the return address
-    mov     [rcx+040h],  rax        ; save as stack pointer
-    mov     rax,         [rsp]      ; load return address
-    mov     [rcx+048h],  rax        ; save return address
-
-    mov     r12,        [rdx]       ; restore R12
-    mov     r13,        [rdx+08h]   ; restore R13
-    mov     r14,        [rdx+010h]  ; restore R14
-    mov     r15,        [rdx+018h]  ; restore R15
-    mov     rdi,        [rdx+020h]  ; restore RDI
-    mov     rsi,        [rdx+028h]  ; restore RSI
-    mov     rbx,        [rdx+030h]  ; restore RBX
-    mov     rbp,        [rdx+038h]  ; restore RBP
-
-    mov     r10,        gs:[030h]   ; load NT_TIB
-    mov     rax,        [rdx+050h]  ; load stack base
-    mov     [r10+08h],  rax         ; restore stack base
-    mov     rax,        [rdx+058h]  ; load stack limit
-    mov     [r10+010h], rax         ; restore stack limit
-    mov     rax,        [rdx+060h]  ; load fiber local storage
-    mov     [r10+018h], rax         ; restore fiber local storage
-
-    mov     rsp,        [rdx+040h]  ; restore RSP
-    mov     r10,        [rdx+048h]  ; fetch the address to returned to
-
-    mov     rax,        r8          ; use third arg as return value after jump
-    mov     rcx,        r8          ; use third arg as first arg in context function
-
-    jmp     r10                     ; indirect jump to caller
-jump_fcontext ENDP
-
-make_fcontext PROC EXPORT FRAME  ; generate function table entry in .pdata and unwind information in    E
-    .endprolog                   ; .xdata for a function's structured exception handling unwind behavior
-
-    mov  [rcx],      rcx         ; store the address of current context
-    mov  [rcx+048h], rdx         ; save the address of the function supposed to run
-    mov  rdx,        [rcx+050h]  ; load the address where the context stack beginns
-
-    push  rcx                    ; save pointer to fcontext_t
-    sub   rsp,       028h        ; reserve shadow space for align_stack
-    mov   rcx,       rdx         ; stack pointer as arg for align_stack
-    mov   [rsp+8],   rcx
-    call  align_stack   ; align stack
-    mov   rdx,       rax         ; begin of aligned stack
-    add   rsp,       028h
-    pop   rcx                    ; restore pointer to fcontext_t
-
-    lea  rdx,        [rdx-028h]  ; reserve 32byte shadow space + return address on stack, (RSP + 8) % 16 == 0
-    mov  [rcx+040h], rdx         ; save the address where the context stack beginns
-
-    stmxcsr [rcx+068h]           ; save MMX control and status word
-    fnstcw  [rcx+06ch]           ; save x87 control word
-
-    lea  rax,       finish       ; helper code executed after fn() returns
-    mov  [rdx],     rax          ; store address off the helper function as return address
-
-    xor  rax,       rax          ; set RAX to zero
-    ret
-
-finish:
-    xor   rcx,        rcx
-    mov   [rsp+08h],  rcx
-    call  _exit                  ; exit application
-    hlt
-make_fcontext ENDP
-END
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_sysv_elf_gas.S b/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_sysv_elf_gas.S
deleted file mode 100644
index ad2d42b..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_sysv_elf_gas.S
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-            http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/****************************************************************************************
- *                                                                                      *
- *  ----------------------------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        RBX        |        R12        |         R13        |        R14        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        R15        |        RBP        |         RSP        |        RIP        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |   16    |   17    |   18    |    19   |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |  0x40   |  0x44   |  0x48   |   0x4c  |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |       sbase       |        slimit     |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    20   |    21   |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x50  |   0x54  |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *                                                                                      *
- * **************************************************************************************/
-
-.text
-.globl jump_fcontext
-.type jump_fcontext,@function
-.align 16
-jump_fcontext:
-    movq     %rbx,       (%rdi)         /* save RBX */
-    movq     %r12,       0x8(%rdi)      /* save R12 */
-    movq     %r13,       0x10(%rdi)     /* save R13 */
-    movq     %r14,       0x18(%rdi)     /* save R14 */
-    movq     %r15,       0x20(%rdi)     /* save R15 */
-    movq     %rbp,       0x28(%rdi)     /* save RBP */
-
-    cmp      $0,         %rcx
-    je       1f
-
-    stmxcsr  0x50(%rdi)             /* save MMX control and status word */
-    fnstcw   0x54(%rdi)             /* save x87 control word */
-
-    ldmxcsr  0x50(%rsi)             /* restore MMX control and status word */
-    fldcw    0x54(%rsi)             /* restore x87 control word */
-1:
-
-    leaq     0x8(%rsp),  %rax       /* exclude the return address and save as stack pointer */
-    movq     %rax,       0x30(%rdi) /* save as stack pointer */
-    movq     (%rsp),     %rax       /* save return address */
-    movq     %rax,       0x38(%rdi) /* save return address as RIP */
-
-    movq     (%rsi),      %rbx      /* restore RBX */
-    movq     0x8(%rsi),   %r12      /* restore R12 */
-    movq     0x10(%rsi),  %r13      /* restore R13 */
-    movq     0x18(%rsi),  %r14      /* restore R14 */
-    movq     0x20(%rsi),  %r15      /* restore R15 */
-    movq     0x28(%rsi),  %rbp      /* restore RBP */
-
-    movq     0x30(%rsi),  %rsp      /* restore RSP */
-    movq     0x38(%rsi),  %rcx      /* fetch the address to return to */
-
-    movq     %rdx,        %rax      /* use third arg as return value after jump */
-    movq     %rdx,        %rdi      /* use third arg as first arg in context function */
-
-    jmp      *%rcx                  /* indirect jump to context */
-.size jump_fcontext,.-jump_fcontext
-
-.text
-.globl make_fcontext
-.type make_fcontext,@function
-.align 16
-make_fcontext:
-    movq   %rdi,                 (%rdi)     /* save the address of passed context */
-    movq   %rsi,                 0x38(%rdi) /* save the address of the context function */
-    movq   0x40(%rdi),           %rdx       /* load the stack base */
-
-    pushq  %rdi                             /* save pointer to fcontext_t */
-    movq   %rdx,                 %rdi       /* stack pointer as arg for align_stack */
-    call   align_stack@PLT                  /* align stack */
-    movq   %rax,                 %rdx       /* begin of aligned stack */
-    popq   %rdi                             /* restore pointer to fcontext_t */
-
-    leaq   -0x8(%rdx),           %rdx       /* reserve space for the last frame on stack, (RSP + 8) & 15 == 0 */
-    movq   %rdx,                 0x30(%rdi) /* save the algined stack base */
-
-    stmxcsr  0x50(%rdi)                     /* save MMX control and status word */
-    fnstcw   0x54(%rdi)                     /* save x87 control word */
-
-    leaq   finish(%rip),         %rcx       /* address of finish; called after context function returns */
-    movq   %rcx,                 (%rdx)
-
-    xorq   %rax,                 %rax
-    ret
-
-finish:
-    xorq    %rdi,              %rdi         /* exit code is zero */
-    call   _exit@PLT                        /* exit application */
-    hlt
-.size make_fcontext,.-make_fcontext
-
diff --git a/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_sysv_macho_gas.S b/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_sysv_macho_gas.S
deleted file mode 100644
index eea76e4..0000000
--- a/vendor/boost_1.51/libs/context/asm/fcontext_x86_64_sysv_macho_gas.S
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-            Copyright Oliver Kowalke 2009.
-   Distributed under the Boost Software License, Version 1.0.
-      (See accompanying file LICENSE_1_0.txt or copy at
-            http://www.boost.org/LICENSE_1_0.txt)
-*/
-
-/****************************************************************************************
- *                                                                                      *
- *  ----------------------------------------------------------------------------------  *
- *  |    0    |    1    |    2    |    3    |    4     |    5    |    6    |    7    |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x0   |   0x4   |   0x8   |   0xc   |   0x10   |   0x14  |   0x18  |   0x1c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        RBX        |        R12        |         R13        |        R14        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    8    |    9    |   10    |   11    |    12    |    13   |    14   |    15   |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x20  |   0x24  |   0x28  |  0x2c   |   0x30   |   0x34  |   0x38  |   0x3c  |  *
- *  ----------------------------------------------------------------------------------  *
- *  |        R15        |        RBP        |         RSP        |        RIP        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |   16    |   17    |   18    |    19   |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |  0x40   |  0x44   |  0x48   |   0x4c  |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  |       sbase       |        slimit     |                                        |  *
- *  ----------------------------------------------------------------------------------  *
- *  ----------------------------------------------------------------------------------  *
- *  |    20   |    21   |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  |   0x50  |   0x54  |                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *  | fc_mxcsr|fc_x87_cw|                                                            |  *
- *  ----------------------------------------------------------------------------------  *
- *                                                                                      *
- * **************************************************************************************/
-
-.text
-.globl _jump_fcontext
-.align 8
-_jump_fcontext:
-    movq     %rbx,       (%rdi)         /* save RBX */
-    movq     %r12,       0x8(%rdi)      /* save R12 */
-    movq     %r13,       0x10(%rdi)     /* save R13 */
-    movq     %r14,       0x18(%rdi)     /* save R14 */
-    movq     %r15,       0x20(%rdi)     /* save R15 */
-    movq     %rbp,       0x28(%rdi)     /* save RBP */
-
-    cmp      $0,         %rcx
-    je       1f
-
-    stmxcsr  0x50(%rdi)             /* save MMX control and status word */
-    fnstcw   0x54(%rdi)             /* save x87 control word */
-
-    ldmxcsr  0x50(%rsi)             /* restore MMX control and status word */
-    fldcw    0x54(%rsi)             /* restore x87 control word */
-1:
-
-    leaq     0x8(%rsp),  %rax       /* exclude the return address and save as stack pointer */
-    movq     %rax,       0x30(%rdi) /* save as stack pointer */
-    movq     (%rsp),     %rax       /* save return address */
-    movq     %rax,       0x38(%rdi) /* save return address as RIP */
-
-    movq     (%rsi),      %rbx      /* restore RBX */
-    movq     0x8(%rsi),   %r12      /* restore R12 */
-    movq     0x10(%rsi),  %r13      /* restore R13 */
-    movq     0x18(%rsi),  %r14      /* restore R14 */
-    movq     0x20(%rsi),  %r15      /* restore R15 */
-    movq     0x28(%rsi),  %rbp      /* restore RBP */
-
-    movq     0x30(%rsi),  %rsp      /* restore RSP */
-    movq     0x38(%rsi),  %rcx      /* fetch the address to return to */
-
-    movq     %rdx,        %rax      /* use third arg as return value after jump */
-    movq     %rdx,        %rdi      /* use third arg as first arg in context function */
-
-    jmp      *%rcx                  /* indirect jump to context */
-
-.text
-.globl _make_fcontext
-.align 8
-_make_fcontext:
-    movq   %rdi,                 (%rdi)     /* save the address of current context */
-    movq   %rsi,                 0x38(%rdi) /* save the address of the function supposed to run */
-    movq   0x40(%rdi),           %rdx       /* load the stack base */
-
-    pushq  %rdi                             /* save pointer to fcontext_t */
-    movq   %rdx,                 %rdi       /* stack pointer as arg for align_stack */
-    call   _align_stack                     /* align stack */
-    movq   %rax,                 %rdx       /* begin of aligned stack */
-    popq   %rdi                             /* restore pointer to fcontext_t */
-
-    leaq   -0x8(%rdx),           %rdx       /* reserve space for the last frame on stack, (RSP + 8) % 16 == 0 */
-    movq   %rdx,                 0x30(%rdi) /* save the address */
-
-    stmxcsr  0x50(%rdi)                     /* save MMX control and status word */
-    fnstcw   0x54(%rdi)                     /* save x87 control word */
-
-    leaq   finish(%rip),         %rcx       /* helper code executed after context function returns */
-    movq   %rcx,                 (%rdx)
-
-    xorq   %rax,                 %rax       /* set RAX to zero */
-    ret
-
-finish:
-    xorq    %rdi,              %rdi         /* exit code is zero */
-    call   _exit                            /* exit application */
-    hlt
diff --git a/vendor/boost_1.51/libs/context/fcontext.cpp b/vendor/boost_1.51/libs/context/fcontext.cpp
deleted file mode 100644
index 596cbd8..0000000
--- a/vendor/boost_1.51/libs/context/fcontext.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_CONTEXT_SOURCE
-
-#include <boost/context/fcontext.hpp>
-
-#include <cstddef>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace ctx {
-namespace detail {
-
-extern "C" BOOST_CONTEXT_DECL
-void * BOOST_CONTEXT_CALLDECL align_stack( void * vp)
-{
-    void * base = vp;
-    if ( 0 != ( ( ( uintptr_t) base) & 15) )
-        base = ( char * ) ( ( ( ( uintptr_t) base) - 15) & ~0x0F);
-    return base;
-}
-
-}
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
diff --git a/vendor/boost_1.51/libs/context/seh.cpp b/vendor/boost_1.51/libs/context/seh.cpp
deleted file mode 100644
index 9363805..0000000
--- a/vendor/boost_1.51/libs/context/seh.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_CONTEXT_SOURCE
-
-extern "C" {
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include <excpt.h>
-#include <windows.h>
-#include <winnt.h>
-
-#if defined(_MSC_VER)
-# define SNPRINTF _snprintf
-#else
-# define SNPRINTF snprintf
-#endif
-
-static const char * exception_description(
-    _EXCEPTION_RECORD const* record, char * description, size_t len)
-{
-    const DWORD code = record->ExceptionCode;
-    const ULONG_PTR * info = record->ExceptionInformation;
-
-    switch ( code)
-    {
-    case EXCEPTION_ACCESS_VIOLATION:
-    {
-        const char * accessType = ( info[0]) ? "writing" : "reading";
-        const ULONG_PTR address = info[1];
-        SNPRINTF( description, len, "Access violation %s %p", accessType, reinterpret_cast< void * >( address) );
-        return description;
-    }
-    case EXCEPTION_DATATYPE_MISALIGNMENT:    return "Datatype misalignment";
-    case EXCEPTION_BREAKPOINT:               return "Breakpoint";
-    case EXCEPTION_SINGLE_STEP:              return "Single step";
-    case EXCEPTION_ARRAY_BOUNDS_EXCEEDED:    return "Array bounds exceeded";
-    case EXCEPTION_FLT_DENORMAL_OPERAND:     return "FPU denormal operand";
-    case EXCEPTION_FLT_DIVIDE_BY_ZERO:       return "FPU divide by zero";
-    case EXCEPTION_FLT_INEXACT_RESULT:       return "FPU inexact result";
-    case EXCEPTION_FLT_INVALID_OPERATION:    return "FPU invalid operation";
-    case EXCEPTION_FLT_OVERFLOW:             return "FPU overflow";
-    case EXCEPTION_FLT_STACK_CHECK:          return "FPU stack check";
-    case EXCEPTION_FLT_UNDERFLOW:            return "FPU underflow";
-    case EXCEPTION_INT_DIVIDE_BY_ZERO:       return "Integer divide by zero";
-    case EXCEPTION_INT_OVERFLOW:             return "Integer overflow";
-    case EXCEPTION_PRIV_INSTRUCTION:         return "Privileged instruction";
-    case EXCEPTION_IN_PAGE_ERROR:            return "In page error";
-    case EXCEPTION_ILLEGAL_INSTRUCTION:      return "Illegal instruction";
-    case EXCEPTION_NONCONTINUABLE_EXCEPTION: return "Noncontinuable exception";
-    case EXCEPTION_STACK_OVERFLOW:           return "Stack overflow";
-    case EXCEPTION_INVALID_DISPOSITION:      return "Invalid disposition";
-    case EXCEPTION_GUARD_PAGE:               return "Guard page";
-    case EXCEPTION_INVALID_HANDLE:           return "Invalid handle";
-    }
-
-    SNPRINTF( description, len, "Unknown (0x%08lX)", code);
-    return description;
-}
-
-EXCEPTION_DISPOSITION seh_fcontext(
-     struct _EXCEPTION_RECORD * record,
-     void *,
-     struct _CONTEXT *,
-     void *)
-{
-    char description[255];
-
-    fprintf( stderr, "exception: %s (%08lX)\n",
-        exception_description( record, description, sizeof( description) ),
-        record->ExceptionCode);
-
-    ExitProcess( -1);
-
-    return ExceptionContinueSearch; // never reached
-}
-
-}
diff --git a/vendor/boost_1.51/libs/context/stack_allocator_posix.cpp b/vendor/boost_1.51/libs/context/stack_allocator_posix.cpp
deleted file mode 100644
index 64291e7..0000000
--- a/vendor/boost_1.51/libs/context/stack_allocator_posix.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_CONTEXT_SOURCE
-
-#include <boost/context/stack_allocator.hpp>
-
-extern "C" {
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-}
-
-#include <stdexcept>
-
-#include <boost/config.hpp>
-#include <boost/assert.hpp>
-#include <boost/format.hpp>
-
-#include <boost/context/stack_utils.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-namespace boost {
-namespace ctx {
-
-void *
-stack_allocator::allocate( std::size_t size) const
-{
-    if ( minimum_stacksize() > size)
-        throw std::invalid_argument(
-            boost::str( boost::format("invalid stack size: must be at least %d bytes")
-                % minimum_stacksize() ) );
-
-    if ( ! is_stack_unbound() && ( maximum_stacksize() < size) )
-        throw std::invalid_argument(
-            boost::str( boost::format("invalid stack size: must not be larger than %d bytes")
-                % maximum_stacksize() ) );
-
-    const std::size_t pages( page_count( size) + 1); // add +1 for guard page
-    std::size_t size_ = pages * pagesize();
-
-    
-# if defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
-    void * limit =     ::mmap( 0, size_, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, -1, 0);
-# else
-    const int fd( ::open("/dev/zero", O_RDONLY) );
-    BOOST_ASSERT( -1 != fd);
-   void * limit =     ::mmap( 0, size_, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
-    ::close( fd);
-# endif
-    if ( ! limit) throw std::bad_alloc();
-
-    const int result( ::mprotect( limit, pagesize(), PROT_NONE) );
-    BOOST_ASSERT( 0 == result);
-    (void)result; // unused in release build
-
-    return static_cast< char * >( limit) + size_;
-}
-
-void
-stack_allocator::deallocate( void * vp, std::size_t size) const
-{
-    if ( vp)
-    {
-        const std::size_t pages( page_count( size) + 1); // add +1 for guard page
-        std::size_t size_ = pages * pagesize();
-        BOOST_ASSERT( 0 < size && 0 < size_);
-        void * limit = static_cast< char * >( vp) - size_;
-        ::munmap( limit, size_);
-    }
-}
-
-}}
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
diff --git a/vendor/boost_1.51/libs/context/stack_allocator_windows.cpp b/vendor/boost_1.51/libs/context/stack_allocator_windows.cpp
deleted file mode 100644
index 518239f..0000000
--- a/vendor/boost_1.51/libs/context/stack_allocator_windows.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_CONTEXT_SOURCE
-
-#include <boost/context/stack_allocator.hpp>
-
-extern "C" {
-#include <windows.h>
-}
-
-#include <stdexcept>
-
-#include <boost/config.hpp>
-#include <boost/assert.hpp>
-#include <boost/cstdint.hpp>
-#include <boost/format.hpp>
-
-#include <boost/context/stack_utils.hpp>
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_PREFIX
-#endif
-
-# if defined(BOOST_MSVC)
-# pragma warning(push)
-# pragma warning(disable:4244 4267)
-# endif
-
-namespace boost {
-namespace ctx {
-
-void *
-stack_allocator::allocate( std::size_t size) const
-{
-    if ( minimum_stacksize() > size)
-        throw std::invalid_argument(
-            boost::str( boost::format("invalid stack size: must be at least %d bytes")
-                % minimum_stacksize() ) );
-
-    if ( ! is_stack_unbound() && ( maximum_stacksize() < size) )
-        throw std::invalid_argument(
-            boost::str( boost::format("invalid stack size: must not be larger than %d bytes")
-                % maximum_stacksize() ) );
-
-    const std::size_t pages( page_count( size) + 1); // add +1 for guard page
-    std::size_t size_ = pages * pagesize();
-
-#ifndef BOOST_CONTEXT_FIBER
-    void * limit = ::VirtualAlloc( 0, size_, MEM_COMMIT, PAGE_READWRITE);
-    if ( ! limit) throw std::bad_alloc();
-
-    DWORD old_options;
-    const BOOL result = ::VirtualProtect(
-        limit, pagesize(), PAGE_READWRITE | PAGE_GUARD /*PAGE_NOACCESS*/, & old_options);
-    BOOST_ASSERT( FALSE != result);
-
-    return static_cast< char * >( limit) + size_;
-#endif
-}
-
-void
-stack_allocator::deallocate( void * vp, std::size_t size) const
-{
-    if ( vp)
-    {
-        const std::size_t pages( page_count( size) + 1); // add +1 for guard page
-        std::size_t size_ = pages * pagesize();
-        BOOST_ASSERT( 0 < size && 0 < size_);
-        void * limit = static_cast< char * >( vp) - size_;
-        ::VirtualFree( limit, 0, MEM_RELEASE);
-    }
-}
-
-}}
-
-# if defined(BOOST_MSVC)
-# pragma warning(pop)
-# endif
-
-#ifdef BOOST_HAS_ABI_HEADERS
-#  include BOOST_ABI_SUFFIX
-#endif
diff --git a/vendor/boost_1.51/libs/context/stack_utils_posix.cpp b/vendor/boost_1.51/libs/context/stack_utils_posix.cpp
deleted file mode 100644
index 13c4e4e..0000000
--- a/vendor/boost_1.51/libs/context/stack_utils_posix.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_CONTEXT_SOURCE
-
-#include <boost/context/stack_utils.hpp>
-
-extern "C" {
-#include <signal.h>
-#include <sys/resource.h>
-#include <sys/time.h>
-#include <unistd.h>
-}
-
-#include <cmath>
-
-#include <boost/assert.hpp>
-
-namespace {
-
-static rlimit stacksize_limit_()
-{
-    rlimit limit;
-    const int result = ::getrlimit( RLIMIT_STACK, & limit);
-    BOOST_ASSERT( 0 == result);
-    (void)result; // unused when in release mode... 
-    return limit;
-}
-
-static rlimit stacksize_limit()
-{
-    static rlimit limit = stacksize_limit_();
-    return limit;
-}
-
-}
-
-namespace boost {
-namespace ctx {
-
-BOOST_CONTEXT_DECL
-std::size_t default_stacksize()
-{
-    static std::size_t size = 256 * 1024;
-    return size;
-}
-
-BOOST_CONTEXT_DECL
-std::size_t minimum_stacksize()
-{ return SIGSTKSZ; }
-
-BOOST_CONTEXT_DECL
-std::size_t maximum_stacksize()
-{
-    BOOST_ASSERT( ! is_stack_unbound() );
-    return static_cast< std::size_t >( stacksize_limit().rlim_max);
-}
-
-BOOST_CONTEXT_DECL
-bool is_stack_unbound()
-{ return RLIM_INFINITY == stacksize_limit().rlim_max; }
-
-BOOST_CONTEXT_DECL
-std::size_t pagesize()
-{
-    static std::size_t pagesize( ::getpagesize() );
-    return pagesize;
-}
-
-BOOST_CONTEXT_DECL
-std::size_t page_count( std::size_t stacksize)
-{
-    return static_cast< std::size_t >( 
-        std::ceil(
-            static_cast< float >( stacksize) / pagesize() ) );
-}
-
-}}
diff --git a/vendor/boost_1.51/libs/context/stack_utils_windows.cpp b/vendor/boost_1.51/libs/context/stack_utils_windows.cpp
deleted file mode 100644
index 373033d..0000000
--- a/vendor/boost_1.51/libs/context/stack_utils_windows.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-
-//          Copyright Oliver Kowalke 2009.
-// Distributed under the Boost Software License, Version 1.0.
-//    (See accompanying file LICENSE_1_0.txt or copy at
-//          http://www.boost.org/LICENSE_1_0.txt)
-
-#define BOOST_CONTEXT_SOURCE
-
-#include <boost/context/stack_utils.hpp>
-
-extern "C" {
-#include <windows.h>
-}
-
-#include <cmath>
-#include <csignal>
-
-#include <boost/assert.hpp>
-
-namespace {
-
-static SYSTEM_INFO system_info_()
-{
-    SYSTEM_INFO si;
-    ::GetSystemInfo( & si);
-    return si;
-}
-
-static SYSTEM_INFO system_info()
-{
-    static SYSTEM_INFO si = system_info_();
-    return si;
-}
-
-}
-
-namespace boost {
-namespace ctx {
-
-BOOST_CONTEXT_DECL
-std::size_t default_stacksize()
-{
-    static std::size_t size = 256 * 1024;
-    return size;
-}
-
-BOOST_CONTEXT_DECL
-std::size_t minimum_stacksize()
-{
-    static std::size_t stacksize(
-        static_cast< std::size_t >( system_info().dwAllocationGranularity) );
-    return stacksize;
-}
-
-BOOST_CONTEXT_DECL
-std::size_t maximum_stacksize()
-{
-    BOOST_ASSERT( ! is_stack_unbound() );
-    static std::size_t stacksize = 8 * 1024 * 1024;
-    return stacksize;
-}
-
-// Windows seams not to provide a limit for the stacksize
-BOOST_CONTEXT_DECL
-bool is_stack_unbound()
-{ return true; }
-
-BOOST_CONTEXT_DECL
-std::size_t pagesize()
-{
-    static std::size_t pagesize(
-        static_cast< std::size_t >( system_info().dwPageSize) );
-    return pagesize;
-}
-
-BOOST_CONTEXT_DECL
-std::size_t page_count( std::size_t stacksize)
-{
-    return static_cast< std::size_t >(
-        std::ceil(
-            static_cast< float >( stacksize) / pagesize() ) );
-}
-
-}}
diff --git a/vendor/diff-match-patch-cpp-stl b/vendor/diff-match-patch-cpp-stl
deleted file mode 160000
index 7f95b37..0000000
--- a/vendor/diff-match-patch-cpp-stl
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7f95b37e554453262e2bcda830724fc362614103

From 997d211fb16acad6bc5f14cc68b1041f3712db7a Mon Sep 17 00:00:00 2001
From: pbattu <p.battu@pbsa.info>
Date: Tue, 21 May 2019 19:06:39 -0300
Subject: [PATCH 106/108] removed websocket submodule

---
 .gitmodules        | 6 ------
 vendor/websocketpp | 1 -
 2 files changed, 7 deletions(-)
 delete mode 160000 vendor/websocketpp

diff --git a/.gitmodules b/.gitmodules
index 0c2a833..0e539dc 100755
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,3 @@
-[submodule "vendor/diff-match-patch-cpp-stl"]
-    path = vendor/diff-match-patch-cpp-stl
-    url = https://github.com/leutloff/diff-match-patch-cpp-stl
 [submodule "vendor/secp256k1-zkp"]
     path = vendor/secp256k1-zkp
     url = https://github.com/bitshares/secp256k1-zkp.git
-[submodule "vendor/websocketpp"]
-    path = vendor/websocketpp
-    url = https://github.com/zaphoyd/websocketpp.git
diff --git a/vendor/websocketpp b/vendor/websocketpp
deleted file mode 160000
index 378437a..0000000
--- a/vendor/websocketpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 378437aecdcb1dfe62096ffd5d944bf1f640ccc3

From 6c9e857bd26e2acd62953f4783164faba044f98f Mon Sep 17 00:00:00 2001
From: pbattu <p.battu@pbsa.info>
Date: Tue, 21 May 2019 19:19:03 -0300
Subject: [PATCH 107/108] maintaing PBSA own websocketpp(forked from zaphoyd

---
 vendor/websocketpp/.gitattributes             |   18 +
 vendor/websocketpp/.gitignore                 |   94 +
 vendor/websocketpp/.travis.yml                |   21 +
 vendor/websocketpp/CMakeLists.txt             |  261 ++
 vendor/websocketpp/COPYING                    |  145 +
 vendor/websocketpp/Doxyfile                   | 2355 ++++++++++++++++
 vendor/websocketpp/SConstruct                 |  281 ++
 vendor/websocketpp/changelog.md               |  342 +++
 vendor/websocketpp/docs/faq.dox               |   86 +
 vendor/websocketpp/docs/getting_started.dox   |   27 +
 vendor/websocketpp/docs/handlers.dox          |  165 ++
 vendor/websocketpp/docs/manual.css            |   22 +
 vendor/websocketpp/docs/manual.dox            |   21 +
 .../docs/simple_broadcast_server.cpp          |   52 +
 .../docs/simple_count_server_thread.cpp       |   65 +
 vendor/websocketpp/docs/tutorials.dox         |   10 +
 .../associative_storage/CMakeLists.txt        |   12 +
 .../associative_storage.cpp                   |   88 +
 .../examples/broadcast_server/CMakeLists.txt  |   12 +
 .../examples/broadcast_server/SConscript      |   23 +
 .../broadcast_server/broadcast_server.cpp     |  160 ++
 .../examples/debug_client/CMakeLists.txt      |   17 +
 .../examples/debug_client/SConscript          |   24 +
 .../examples/debug_client/debug_client.cpp    |  167 ++
 .../examples/debug_server/CMakeLists.txt      |   12 +
 .../examples/debug_server/SConscript          |   23 +
 .../examples/debug_server/debug_server.cpp    |  174 ++
 .../websocketpp/examples/dev/CMakeLists.txt   |   12 +
 vendor/websocketpp/examples/dev/SConscript    |   18 +
 vendor/websocketpp/examples/dev/main.cpp      |  200 ++
 .../examples/echo_client/CMakeLists.txt       |   12 +
 .../examples/echo_client/SConscript           |   23 +
 .../examples/echo_client/echo_client.cpp      |   97 +
 .../examples/echo_server/CMakeLists.txt       |   12 +
 .../examples/echo_server/SConscript           |   23 +
 .../examples/echo_server/echo_handler.hpp     |   37 +
 .../examples/echo_server/echo_server.cpp      |   65 +
 .../examples/echo_server_both/CMakeLists.txt  |   18 +
 .../examples/echo_server_both/SConscript      |   24 +
 .../echo_server_both/echo_server_both.cpp     |   87 +
 .../examples/echo_server_both/server.pem      |   58 +
 .../examples/echo_server_tls/CMakeLists.txt   |   18 +
 .../examples/echo_server_tls/SConscript       |   24 +
 .../examples/echo_server_tls/dh.pem           |    8 +
 .../echo_server_tls/echo_server_tls.cpp       |  154 ++
 .../examples/echo_server_tls/server.pem       |   55 +
 .../examples/enriched_storage/CMakeLists.txt  |   12 +
 .../enriched_storage/enriched_storage.cpp     |   87 +
 .../external_io_service/CMakeLists.txt        |   12 +
 .../examples/external_io_service/SConscript   |   23 +
 .../external_io_service.cpp                   |   85 +
 .../external_io_service/tcp_echo_server.hpp   |   97 +
 .../examples/handler_switch/CMakeLists.txt    |   12 +
 .../handler_switch/handler_switch.cpp         |   42 +
 .../examples/iostream_server/CMakeLists.txt   |   12 +
 .../examples/iostream_server/SConscript       |   23 +
 .../iostream_server/iostream_server.cpp       |   89 +
 .../examples/print_server/CMakeLists.txt      |   12 +
 .../examples/print_server/SConscript          |   23 +
 .../examples/print_server/print_server.cpp    |   24 +
 .../examples/scratch_client/SConscript        |   24 +
 .../scratch_client/scratch_client.cpp         |  270 ++
 .../examples/scratch_server/SConscript        |   24 +
 .../scratch_server/scratch_server.cpp         |  106 +
 .../simple_broadcast_server/CMakeLists.txt    |   12 +
 .../simple_broadcast_server.cpp               |   51 +
 .../examples/sip_client/CMakeLists.txt        |   12 +
 .../examples/sip_client/README.txt            |   22 +
 .../examples/sip_client/SConscript            |   23 +
 .../examples/sip_client/sip_client.cpp        |   84 +
 .../subprotocol_server/CMakeLists.txt         |   12 +
 .../examples/subprotocol_server/SConscript    |   23 +
 .../subprotocol_server/subprotocol_server.cpp |   48 +
 .../examples/telemetry_client/CMakeLists.txt  |   12 +
 .../examples/telemetry_client/SConscript      |   23 +
 .../telemetry_client/telemetry_client.cpp     |  156 ++
 .../examples/telemetry_server/CMakeLists.txt  |   12 +
 .../examples/telemetry_server/SConscript      |   23 +
 .../examples/telemetry_server/index.html      |   85 +
 .../telemetry_server/telemetry_server.cpp     |  203 ++
 .../examples/testee_client/CMakeLists.txt     |   17 +
 .../examples/testee_client/SConscript         |   23 +
 .../examples/testee_client/testee_client.cpp  |  145 +
 .../examples/testee_server/CMakeLists.txt     |   17 +
 .../examples/testee_server/SConscript         |   23 +
 .../examples/testee_server/testee_server.cpp  |  145 +
 .../examples/utility_client/CMakeLists.txt    |   13 +
 .../examples/utility_client/SConscript        |   23 +
 .../utility_client/utility_client.cpp         |  325 +++
 vendor/websocketpp/readme.md                  |   49 +
 vendor/websocketpp/roadmap.md                 |   43 +
 .../test/connection/CMakeLists.txt            |   12 +
 vendor/websocketpp/test/connection/SConscript |   25 +
 .../test/connection/connection.cpp            |  530 ++++
 .../test/connection/connection_tu2.cpp        |   62 +
 .../test/connection/connection_tu2.hpp        |   51 +
 .../websocketpp/test/endpoint/CMakeLists.txt  |   17 +
 vendor/websocketpp/test/endpoint/SConscript   |   24 +
 vendor/websocketpp/test/endpoint/endpoint.cpp |  155 ++
 .../websocketpp/test/extension/CMakeLists.txt |   22 +
 vendor/websocketpp/test/extension/SConscript  |   27 +
 .../websocketpp/test/extension/extension.cpp  |   37 +
 .../test/extension/permessage_deflate.cpp     |  649 +++++
 vendor/websocketpp/test/http/CMakeLists.txt   |   11 +
 vendor/websocketpp/test/http/SConscript       |   23 +
 vendor/websocketpp/test/http/parser.cpp       | 1129 ++++++++
 vendor/websocketpp/test/http/parser_perf.cpp  |  141 +
 vendor/websocketpp/test/logger/CMakeLists.txt |   12 +
 vendor/websocketpp/test/logger/SConscript     |   23 +
 vendor/websocketpp/test/logger/basic.cpp      |  145 +
 .../test/message_buffer/CMakeLists.txt        |   17 +
 .../test/message_buffer/SConscript            |   27 +
 .../websocketpp/test/message_buffer/alloc.cpp |   96 +
 .../test/message_buffer/message.cpp           |   72 +
 .../websocketpp/test/message_buffer/pool.cpp  |  156 ++
 .../test/processors/CMakeLists.txt            |   59 +
 vendor/websocketpp/test/processors/SConscript |   47 +
 .../extension_permessage_compress.cpp         |  198 ++
 vendor/websocketpp/test/processors/hybi00.cpp |  274 ++
 vendor/websocketpp/test/processors/hybi07.cpp |  193 ++
 vendor/websocketpp/test/processors/hybi08.cpp |  197 ++
 vendor/websocketpp/test/processors/hybi13.cpp |  693 +++++
 .../websocketpp/test/processors/processor.cpp |  135 +
 vendor/websocketpp/test/random/CMakeLists.txt |   17 +
 vendor/websocketpp/test/random/SConscript     |   27 +
 vendor/websocketpp/test/random/none.cpp       |   40 +
 .../websocketpp/test/random/random_device.cpp |   50 +
 vendor/websocketpp/test/roles/CMakeLists.txt  |   17 +
 vendor/websocketpp/test/roles/SConscript      |   27 +
 vendor/websocketpp/test/roles/client.cpp      |  194 ++
 vendor/websocketpp/test/roles/server.cpp      |  247 ++
 .../websocketpp/test/transport/CMakeLists.txt |   71 +
 vendor/websocketpp/test/transport/SConscript  |   24 +
 .../test/transport/asio/SConscript            |   32 +
 .../websocketpp/test/transport/asio/base.cpp  |   49 +
 .../test/transport/asio/security.cpp          |   69 +
 .../test/transport/asio/timers.cpp            |  187 ++
 .../websocketpp/test/transport/hybi_util.cpp  |   98 +
 .../test/transport/integration.cpp            |  617 +++++
 .../test/transport/iostream/SConscript        |   31 +
 .../test/transport/iostream/base.cpp          |   33 +
 .../test/transport/iostream/connection.cpp    |  609 +++++
 .../test/transport/iostream/endpoint.cpp      |   41 +
 .../websocketpp/test/utility/CMakeLists.txt   |   53 +
 vendor/websocketpp/test/utility/SConscript    |   40 +
 vendor/websocketpp/test/utility/close.cpp     |  125 +
 vendor/websocketpp/test/utility/error.cpp     |   54 +
 vendor/websocketpp/test/utility/frame.cpp     |  538 ++++
 vendor/websocketpp/test/utility/sha1.cpp      |   81 +
 vendor/websocketpp/test/utility/uri.cpp       |  246 ++
 vendor/websocketpp/test/utility/utilities.cpp |   73 +
 .../broadcast_tutorial/broadcast_tutorial.md  |   17 +
 .../tutorials/chat_tutorial/chat_tutorial.md  |   13 +
 .../tutorials/utility_client/step1.cpp        |   56 +
 .../tutorials/utility_client/step2.cpp        |   61 +
 .../tutorials/utility_client/step3.cpp        |   81 +
 .../tutorials/utility_client/step4.cpp        |  202 ++
 .../tutorials/utility_client/step5.cpp        |  280 ++
 .../tutorials/utility_client/step6.cpp        |  335 +++
 .../utility_client/utility_client.md          |  862 ++++++
 .../tutorials/utility_server/step1.cpp        |   71 +
 .../tutorials/utility_server/step2.cpp        |   82 +
 .../utility_server/utility_server.md          |  181 ++
 .../websocketpp/websocketpp-config.cmake.in   |    7 +
 .../websocketpp-configVersion.cmake.in        |   11 +
 vendor/websocketpp/websocketpp/CMakeLists.txt |    2 +
 .../websocketpp/websocketpp/base64/base64.hpp |  178 ++
 vendor/websocketpp/websocketpp/client.hpp     |   33 +
 vendor/websocketpp/websocketpp/close.hpp      |  342 +++
 .../websocketpp/websocketpp/common/asio.hpp   |  131 +
 .../websocketpp/common/asio_ssl.hpp           |   39 +
 .../websocketpp/websocketpp/common/chrono.hpp |   68 +
 .../websocketpp/common/connection_hdl.hpp     |   52 +
 .../websocketpp/websocketpp/common/cpp11.hpp  |  162 ++
 .../websocketpp/common/functional.hpp         |  105 +
 vendor/websocketpp/websocketpp/common/md5.hpp |  448 ++++
 .../websocketpp/websocketpp/common/memory.hpp |   89 +
 .../websocketpp/common/network.hpp            |  106 +
 .../websocketpp/common/platforms.hpp          |   46 +
 .../websocketpp/websocketpp/common/random.hpp |   82 +
 .../websocketpp/websocketpp/common/regex.hpp  |   59 +
 .../websocketpp/websocketpp/common/stdint.hpp |   73 +
 .../websocketpp/common/system_error.hpp       |   84 +
 .../websocketpp/websocketpp/common/thread.hpp |   84 +
 .../websocketpp/websocketpp/common/time.hpp   |   56 +
 .../websocketpp/common/type_traits.hpp        |   65 +
 .../websocketpp/concurrency/basic.hpp         |   46 +
 .../websocketpp/concurrency/none.hpp          |   80 +
 .../websocketpp/websocketpp/config/asio.hpp   |   77 +
 .../websocketpp/config/asio_client.hpp        |   77 +
 .../websocketpp/config/asio_no_tls.hpp        |   73 +
 .../websocketpp/config/asio_no_tls_client.hpp |   73 +
 .../websocketpp/config/boost_config.hpp       |   72 +
 .../websocketpp/websocketpp/config/core.hpp   |  285 ++
 .../websocketpp/config/core_client.hpp        |  294 ++
 .../websocketpp/websocketpp/config/debug.hpp  |  286 ++
 .../websocketpp/config/debug_asio.hpp         |   77 +
 .../websocketpp/config/debug_asio_no_tls.hpp  |   73 +
 .../websocketpp/config/minimal_client.hpp     |   72 +
 .../websocketpp/config/minimal_server.hpp     |  312 +++
 vendor/websocketpp/websocketpp/connection.hpp | 1651 ++++++++++++
 .../websocketpp/connection_base.hpp           |   38 +
 vendor/websocketpp/websocketpp/endpoint.hpp   |  700 +++++
 .../websocketpp/websocketpp/endpoint_base.hpp |   38 +
 vendor/websocketpp/websocketpp/error.hpp      |  277 ++
 .../websocketpp/extensions/extension.hpp      |  102 +
 .../permessage_deflate/disabled.hpp           |  128 +
 .../extensions/permessage_deflate/enabled.hpp |  752 ++++++
 vendor/websocketpp/websocketpp/frame.hpp      |  861 ++++++
 .../websocketpp/http/constants.hpp            |  308 +++
 .../websocketpp/http/impl/parser.hpp          |  196 ++
 .../websocketpp/http/impl/request.hpp         |  191 ++
 .../websocketpp/http/impl/response.hpp        |  266 ++
 .../websocketpp/websocketpp/http/parser.hpp   |  619 +++++
 .../websocketpp/websocketpp/http/request.hpp  |  124 +
 .../websocketpp/websocketpp/http/response.hpp |  188 ++
 .../websocketpp/impl/connection_impl.hpp      | 2372 +++++++++++++++++
 .../websocketpp/impl/endpoint_impl.hpp        |  269 ++
 .../websocketpp/impl/utilities_impl.hpp       |   87 +
 .../websocketpp/websocketpp/logger/basic.hpp  |  199 ++
 .../websocketpp/websocketpp/logger/levels.hpp |  203 ++
 .../websocketpp/websocketpp/logger/stub.hpp   |  119 +
 .../websocketpp/websocketpp/logger/syslog.hpp |  146 +
 .../websocketpp/message_buffer/alloc.hpp      |  105 +
 .../websocketpp/message_buffer/message.hpp    |  340 +++
 .../websocketpp/message_buffer/pool.hpp       |  229 ++
 .../websocketpp/processors/base.hpp           |  299 +++
 .../websocketpp/processors/hybi00.hpp         |  462 ++++
 .../websocketpp/processors/hybi07.hpp         |   78 +
 .../websocketpp/processors/hybi08.hpp         |   83 +
 .../websocketpp/processors/hybi13.hpp         | 1056 ++++++++
 .../websocketpp/processors/processor.hpp      |  407 +++
 .../websocketpp/websocketpp/random/none.hpp   |   60 +
 .../websocketpp/random/random_device.hpp      |   80 +
 .../websocketpp/roles/client_endpoint.hpp     |  173 ++
 .../websocketpp/roles/server_endpoint.hpp     |  190 ++
 vendor/websocketpp/websocketpp/server.hpp     |   33 +
 vendor/websocketpp/websocketpp/sha1/sha1.hpp  |  189 ++
 .../websocketpp/transport/asio/base.hpp       |  232 ++
 .../websocketpp/transport/asio/connection.hpp | 1204 +++++++++
 .../websocketpp/transport/asio/endpoint.hpp   | 1147 ++++++++
 .../transport/asio/security/base.hpp          |  159 ++
 .../transport/asio/security/none.hpp          |  370 +++
 .../transport/asio/security/tls.hpp           |  480 ++++
 .../websocketpp/transport/base/connection.hpp |  238 ++
 .../websocketpp/transport/base/endpoint.hpp   |   77 +
 .../websocketpp/transport/debug/base.hpp      |  104 +
 .../transport/debug/connection.hpp            |  412 +++
 .../websocketpp/transport/debug/endpoint.hpp  |  140 +
 .../websocketpp/transport/iostream/base.hpp   |  133 +
 .../transport/iostream/connection.hpp         |  714 +++++
 .../transport/iostream/endpoint.hpp           |  222 ++
 .../websocketpp/transport/stub/base.hpp       |   95 +
 .../websocketpp/transport/stub/connection.hpp |  286 ++
 .../websocketpp/transport/stub/endpoint.hpp   |  140 +
 vendor/websocketpp/websocketpp/uri.hpp        |  355 +++
 .../websocketpp/utf8_validator.hpp            |  154 ++
 vendor/websocketpp/websocketpp/utilities.hpp  |  182 ++
 vendor/websocketpp/websocketpp/version.hpp    |   61 +
 259 files changed, 44155 insertions(+)
 create mode 100644 vendor/websocketpp/.gitattributes
 create mode 100644 vendor/websocketpp/.gitignore
 create mode 100644 vendor/websocketpp/.travis.yml
 create mode 100644 vendor/websocketpp/CMakeLists.txt
 create mode 100644 vendor/websocketpp/COPYING
 create mode 100644 vendor/websocketpp/Doxyfile
 create mode 100644 vendor/websocketpp/SConstruct
 create mode 100644 vendor/websocketpp/changelog.md
 create mode 100644 vendor/websocketpp/docs/faq.dox
 create mode 100644 vendor/websocketpp/docs/getting_started.dox
 create mode 100644 vendor/websocketpp/docs/handlers.dox
 create mode 100644 vendor/websocketpp/docs/manual.css
 create mode 100644 vendor/websocketpp/docs/manual.dox
 create mode 100644 vendor/websocketpp/docs/simple_broadcast_server.cpp
 create mode 100644 vendor/websocketpp/docs/simple_count_server_thread.cpp
 create mode 100644 vendor/websocketpp/docs/tutorials.dox
 create mode 100644 vendor/websocketpp/examples/associative_storage/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/associative_storage/associative_storage.cpp
 create mode 100644 vendor/websocketpp/examples/broadcast_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/broadcast_server/SConscript
 create mode 100644 vendor/websocketpp/examples/broadcast_server/broadcast_server.cpp
 create mode 100644 vendor/websocketpp/examples/debug_client/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/debug_client/SConscript
 create mode 100644 vendor/websocketpp/examples/debug_client/debug_client.cpp
 create mode 100644 vendor/websocketpp/examples/debug_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/debug_server/SConscript
 create mode 100644 vendor/websocketpp/examples/debug_server/debug_server.cpp
 create mode 100644 vendor/websocketpp/examples/dev/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/dev/SConscript
 create mode 100644 vendor/websocketpp/examples/dev/main.cpp
 create mode 100644 vendor/websocketpp/examples/echo_client/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/echo_client/SConscript
 create mode 100644 vendor/websocketpp/examples/echo_client/echo_client.cpp
 create mode 100644 vendor/websocketpp/examples/echo_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/echo_server/SConscript
 create mode 100644 vendor/websocketpp/examples/echo_server/echo_handler.hpp
 create mode 100644 vendor/websocketpp/examples/echo_server/echo_server.cpp
 create mode 100644 vendor/websocketpp/examples/echo_server_both/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/echo_server_both/SConscript
 create mode 100644 vendor/websocketpp/examples/echo_server_both/echo_server_both.cpp
 create mode 100644 vendor/websocketpp/examples/echo_server_both/server.pem
 create mode 100644 vendor/websocketpp/examples/echo_server_tls/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/echo_server_tls/SConscript
 create mode 100644 vendor/websocketpp/examples/echo_server_tls/dh.pem
 create mode 100644 vendor/websocketpp/examples/echo_server_tls/echo_server_tls.cpp
 create mode 100644 vendor/websocketpp/examples/echo_server_tls/server.pem
 create mode 100644 vendor/websocketpp/examples/enriched_storage/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/enriched_storage/enriched_storage.cpp
 create mode 100644 vendor/websocketpp/examples/external_io_service/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/external_io_service/SConscript
 create mode 100644 vendor/websocketpp/examples/external_io_service/external_io_service.cpp
 create mode 100644 vendor/websocketpp/examples/external_io_service/tcp_echo_server.hpp
 create mode 100644 vendor/websocketpp/examples/handler_switch/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/handler_switch/handler_switch.cpp
 create mode 100644 vendor/websocketpp/examples/iostream_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/iostream_server/SConscript
 create mode 100644 vendor/websocketpp/examples/iostream_server/iostream_server.cpp
 create mode 100644 vendor/websocketpp/examples/print_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/print_server/SConscript
 create mode 100644 vendor/websocketpp/examples/print_server/print_server.cpp
 create mode 100644 vendor/websocketpp/examples/scratch_client/SConscript
 create mode 100644 vendor/websocketpp/examples/scratch_client/scratch_client.cpp
 create mode 100644 vendor/websocketpp/examples/scratch_server/SConscript
 create mode 100644 vendor/websocketpp/examples/scratch_server/scratch_server.cpp
 create mode 100644 vendor/websocketpp/examples/simple_broadcast_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/simple_broadcast_server/simple_broadcast_server.cpp
 create mode 100644 vendor/websocketpp/examples/sip_client/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/sip_client/README.txt
 create mode 100644 vendor/websocketpp/examples/sip_client/SConscript
 create mode 100644 vendor/websocketpp/examples/sip_client/sip_client.cpp
 create mode 100644 vendor/websocketpp/examples/subprotocol_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/subprotocol_server/SConscript
 create mode 100644 vendor/websocketpp/examples/subprotocol_server/subprotocol_server.cpp
 create mode 100644 vendor/websocketpp/examples/telemetry_client/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/telemetry_client/SConscript
 create mode 100644 vendor/websocketpp/examples/telemetry_client/telemetry_client.cpp
 create mode 100644 vendor/websocketpp/examples/telemetry_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/telemetry_server/SConscript
 create mode 100644 vendor/websocketpp/examples/telemetry_server/index.html
 create mode 100644 vendor/websocketpp/examples/telemetry_server/telemetry_server.cpp
 create mode 100644 vendor/websocketpp/examples/testee_client/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/testee_client/SConscript
 create mode 100644 vendor/websocketpp/examples/testee_client/testee_client.cpp
 create mode 100644 vendor/websocketpp/examples/testee_server/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/testee_server/SConscript
 create mode 100644 vendor/websocketpp/examples/testee_server/testee_server.cpp
 create mode 100644 vendor/websocketpp/examples/utility_client/CMakeLists.txt
 create mode 100644 vendor/websocketpp/examples/utility_client/SConscript
 create mode 100644 vendor/websocketpp/examples/utility_client/utility_client.cpp
 create mode 100644 vendor/websocketpp/readme.md
 create mode 100644 vendor/websocketpp/roadmap.md
 create mode 100644 vendor/websocketpp/test/connection/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/connection/SConscript
 create mode 100644 vendor/websocketpp/test/connection/connection.cpp
 create mode 100644 vendor/websocketpp/test/connection/connection_tu2.cpp
 create mode 100644 vendor/websocketpp/test/connection/connection_tu2.hpp
 create mode 100644 vendor/websocketpp/test/endpoint/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/endpoint/SConscript
 create mode 100644 vendor/websocketpp/test/endpoint/endpoint.cpp
 create mode 100644 vendor/websocketpp/test/extension/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/extension/SConscript
 create mode 100644 vendor/websocketpp/test/extension/extension.cpp
 create mode 100644 vendor/websocketpp/test/extension/permessage_deflate.cpp
 create mode 100644 vendor/websocketpp/test/http/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/http/SConscript
 create mode 100644 vendor/websocketpp/test/http/parser.cpp
 create mode 100644 vendor/websocketpp/test/http/parser_perf.cpp
 create mode 100644 vendor/websocketpp/test/logger/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/logger/SConscript
 create mode 100644 vendor/websocketpp/test/logger/basic.cpp
 create mode 100644 vendor/websocketpp/test/message_buffer/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/message_buffer/SConscript
 create mode 100644 vendor/websocketpp/test/message_buffer/alloc.cpp
 create mode 100644 vendor/websocketpp/test/message_buffer/message.cpp
 create mode 100644 vendor/websocketpp/test/message_buffer/pool.cpp
 create mode 100644 vendor/websocketpp/test/processors/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/processors/SConscript
 create mode 100644 vendor/websocketpp/test/processors/extension_permessage_compress.cpp
 create mode 100644 vendor/websocketpp/test/processors/hybi00.cpp
 create mode 100644 vendor/websocketpp/test/processors/hybi07.cpp
 create mode 100644 vendor/websocketpp/test/processors/hybi08.cpp
 create mode 100644 vendor/websocketpp/test/processors/hybi13.cpp
 create mode 100644 vendor/websocketpp/test/processors/processor.cpp
 create mode 100644 vendor/websocketpp/test/random/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/random/SConscript
 create mode 100644 vendor/websocketpp/test/random/none.cpp
 create mode 100644 vendor/websocketpp/test/random/random_device.cpp
 create mode 100644 vendor/websocketpp/test/roles/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/roles/SConscript
 create mode 100644 vendor/websocketpp/test/roles/client.cpp
 create mode 100644 vendor/websocketpp/test/roles/server.cpp
 create mode 100644 vendor/websocketpp/test/transport/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/transport/SConscript
 create mode 100644 vendor/websocketpp/test/transport/asio/SConscript
 create mode 100644 vendor/websocketpp/test/transport/asio/base.cpp
 create mode 100644 vendor/websocketpp/test/transport/asio/security.cpp
 create mode 100644 vendor/websocketpp/test/transport/asio/timers.cpp
 create mode 100644 vendor/websocketpp/test/transport/hybi_util.cpp
 create mode 100644 vendor/websocketpp/test/transport/integration.cpp
 create mode 100644 vendor/websocketpp/test/transport/iostream/SConscript
 create mode 100644 vendor/websocketpp/test/transport/iostream/base.cpp
 create mode 100644 vendor/websocketpp/test/transport/iostream/connection.cpp
 create mode 100644 vendor/websocketpp/test/transport/iostream/endpoint.cpp
 create mode 100644 vendor/websocketpp/test/utility/CMakeLists.txt
 create mode 100644 vendor/websocketpp/test/utility/SConscript
 create mode 100644 vendor/websocketpp/test/utility/close.cpp
 create mode 100644 vendor/websocketpp/test/utility/error.cpp
 create mode 100644 vendor/websocketpp/test/utility/frame.cpp
 create mode 100644 vendor/websocketpp/test/utility/sha1.cpp
 create mode 100644 vendor/websocketpp/test/utility/uri.cpp
 create mode 100644 vendor/websocketpp/test/utility/utilities.cpp
 create mode 100644 vendor/websocketpp/tutorials/broadcast_tutorial/broadcast_tutorial.md
 create mode 100644 vendor/websocketpp/tutorials/chat_tutorial/chat_tutorial.md
 create mode 100644 vendor/websocketpp/tutorials/utility_client/step1.cpp
 create mode 100644 vendor/websocketpp/tutorials/utility_client/step2.cpp
 create mode 100644 vendor/websocketpp/tutorials/utility_client/step3.cpp
 create mode 100644 vendor/websocketpp/tutorials/utility_client/step4.cpp
 create mode 100644 vendor/websocketpp/tutorials/utility_client/step5.cpp
 create mode 100644 vendor/websocketpp/tutorials/utility_client/step6.cpp
 create mode 100644 vendor/websocketpp/tutorials/utility_client/utility_client.md
 create mode 100644 vendor/websocketpp/tutorials/utility_server/step1.cpp
 create mode 100644 vendor/websocketpp/tutorials/utility_server/step2.cpp
 create mode 100644 vendor/websocketpp/tutorials/utility_server/utility_server.md
 create mode 100644 vendor/websocketpp/websocketpp-config.cmake.in
 create mode 100644 vendor/websocketpp/websocketpp-configVersion.cmake.in
 create mode 100644 vendor/websocketpp/websocketpp/CMakeLists.txt
 create mode 100644 vendor/websocketpp/websocketpp/base64/base64.hpp
 create mode 100644 vendor/websocketpp/websocketpp/client.hpp
 create mode 100644 vendor/websocketpp/websocketpp/close.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/asio.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/asio_ssl.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/chrono.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/connection_hdl.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/cpp11.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/functional.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/md5.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/memory.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/network.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/platforms.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/random.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/regex.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/stdint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/system_error.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/thread.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/time.hpp
 create mode 100644 vendor/websocketpp/websocketpp/common/type_traits.hpp
 create mode 100644 vendor/websocketpp/websocketpp/concurrency/basic.hpp
 create mode 100644 vendor/websocketpp/websocketpp/concurrency/none.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/asio.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/asio_client.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/asio_no_tls.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/asio_no_tls_client.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/boost_config.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/core.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/core_client.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/debug.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/debug_asio.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/debug_asio_no_tls.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/minimal_client.hpp
 create mode 100644 vendor/websocketpp/websocketpp/config/minimal_server.hpp
 create mode 100644 vendor/websocketpp/websocketpp/connection.hpp
 create mode 100644 vendor/websocketpp/websocketpp/connection_base.hpp
 create mode 100644 vendor/websocketpp/websocketpp/endpoint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/endpoint_base.hpp
 create mode 100644 vendor/websocketpp/websocketpp/error.hpp
 create mode 100644 vendor/websocketpp/websocketpp/extensions/extension.hpp
 create mode 100644 vendor/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp
 create mode 100644 vendor/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp
 create mode 100644 vendor/websocketpp/websocketpp/frame.hpp
 create mode 100644 vendor/websocketpp/websocketpp/http/constants.hpp
 create mode 100644 vendor/websocketpp/websocketpp/http/impl/parser.hpp
 create mode 100644 vendor/websocketpp/websocketpp/http/impl/request.hpp
 create mode 100644 vendor/websocketpp/websocketpp/http/impl/response.hpp
 create mode 100644 vendor/websocketpp/websocketpp/http/parser.hpp
 create mode 100644 vendor/websocketpp/websocketpp/http/request.hpp
 create mode 100644 vendor/websocketpp/websocketpp/http/response.hpp
 create mode 100644 vendor/websocketpp/websocketpp/impl/connection_impl.hpp
 create mode 100644 vendor/websocketpp/websocketpp/impl/endpoint_impl.hpp
 create mode 100644 vendor/websocketpp/websocketpp/impl/utilities_impl.hpp
 create mode 100644 vendor/websocketpp/websocketpp/logger/basic.hpp
 create mode 100644 vendor/websocketpp/websocketpp/logger/levels.hpp
 create mode 100644 vendor/websocketpp/websocketpp/logger/stub.hpp
 create mode 100644 vendor/websocketpp/websocketpp/logger/syslog.hpp
 create mode 100644 vendor/websocketpp/websocketpp/message_buffer/alloc.hpp
 create mode 100644 vendor/websocketpp/websocketpp/message_buffer/message.hpp
 create mode 100644 vendor/websocketpp/websocketpp/message_buffer/pool.hpp
 create mode 100644 vendor/websocketpp/websocketpp/processors/base.hpp
 create mode 100644 vendor/websocketpp/websocketpp/processors/hybi00.hpp
 create mode 100644 vendor/websocketpp/websocketpp/processors/hybi07.hpp
 create mode 100644 vendor/websocketpp/websocketpp/processors/hybi08.hpp
 create mode 100644 vendor/websocketpp/websocketpp/processors/hybi13.hpp
 create mode 100644 vendor/websocketpp/websocketpp/processors/processor.hpp
 create mode 100644 vendor/websocketpp/websocketpp/random/none.hpp
 create mode 100644 vendor/websocketpp/websocketpp/random/random_device.hpp
 create mode 100644 vendor/websocketpp/websocketpp/roles/client_endpoint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/roles/server_endpoint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/server.hpp
 create mode 100644 vendor/websocketpp/websocketpp/sha1/sha1.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/asio/base.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/asio/connection.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/asio/endpoint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/asio/security/base.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/asio/security/none.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/asio/security/tls.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/base/connection.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/base/endpoint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/debug/base.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/debug/connection.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/debug/endpoint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/iostream/base.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/iostream/connection.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/iostream/endpoint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/stub/base.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/stub/connection.hpp
 create mode 100644 vendor/websocketpp/websocketpp/transport/stub/endpoint.hpp
 create mode 100644 vendor/websocketpp/websocketpp/uri.hpp
 create mode 100644 vendor/websocketpp/websocketpp/utf8_validator.hpp
 create mode 100644 vendor/websocketpp/websocketpp/utilities.hpp
 create mode 100644 vendor/websocketpp/websocketpp/version.hpp

diff --git a/vendor/websocketpp/.gitattributes b/vendor/websocketpp/.gitattributes
new file mode 100644
index 0000000..a9e4fc7
--- /dev/null
+++ b/vendor/websocketpp/.gitattributes
@@ -0,0 +1,18 @@
+# Lineendings
+*.sln       eol=crlf
+*.vcproj    eol=crlf
+*.vcxproj*  eol=crlf
+
+# Whitespace rules
+# strict (no trailing, no tabs)
+*.cpp       whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+*.hpp       whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+*.c         whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+*.h         whitespace=trailing-space,space-before-tab,tab-in-indent,cr-at-eol
+
+# normal (no trailing)
+*.sql       whitespace=trailing-space,space-before-tab,cr-at-eol
+*.txt       whitespace=trailing-space,space-before-tab,cr-at-eol
+
+# special files which must ignore whitespace
+*.patch     whitespace=-trailing-space
diff --git a/vendor/websocketpp/.gitignore b/vendor/websocketpp/.gitignore
new file mode 100644
index 0000000..1d0c715
--- /dev/null
+++ b/vendor/websocketpp/.gitignore
@@ -0,0 +1,94 @@
+# make .git* files visible to git
+!.gitignore
+!.gitattributes
+
+.DS_Store
+
+#vim stuff
+*~
+*.swp
+
+*.o
+*.so
+*.so.?
+*.so.?.?.?
+*.a
+*.dylib
+lib/*
+
+# CMake
+*.cmake
+*.dir
+CMakeFiles
+INSTALL.*
+ZERO_CHECK.*
+CMakeCache.txt
+install_manifest.txt
+
+# Windows/Visual Studio
+*.vcproj*
+*.sln
+*.suo
+*.ncb
+*/Debug/*
+*/*/Debug/*
+bin/Debug
+*/Release/*
+*/*/Release/*
+*/RelWithDebInfo/*
+*/*/RelWithDebInfo/*
+
+# explicitly allow this path with /debug/ in it
+!websocketpp/transport/debug/*
+
+objs_shared/
+objs_static/
+
+examples/chat_server/chat_server
+examples/echo_server/echo_server
+examples/chat_client/chat_client
+examples/echo_client/echo_client
+test/basic/tests
+libwebsocketpp.dylib.0.1.0
+
+websocketpp.xcodeproj/xcuserdata/*
+websocketpp.xcodeproj/project.xcworkspace/xcuserdata/*
+policy_based_notes.hpp
+
+examples/echo_server_tls/echo_server_tls
+
+examples/fuzzing_client/fuzzing_client
+
+examples/stress_client/stress_client
+
+examples/broadcast_server_tls/broadcast_server
+
+test/basic/perf
+
+examples/echo_server_tls/echo_server_tls
+
+examples/concurrent_server/concurrent_server
+
+examples/fuzzing_server_tls/fuzzing_server
+
+examples/wsperf/wsperf
+
+.sconsign.dblite
+
+build/
+doxygen/
+examples/wsperf/wsperf_client
+
+*.out
+
+*.log
+*.opensdf
+*.sdf
+*.vcxproj
+*.vcxproj.filters
+*.user
+install
+Makefile
+bin
+
+Testing/Temporary/CTestCostData.txt
diff --git a/vendor/websocketpp/.travis.yml b/vendor/websocketpp/.travis.yml
new file mode 100644
index 0000000..a2aa970
--- /dev/null
+++ b/vendor/websocketpp/.travis.yml
@@ -0,0 +1,21 @@
+language: cpp
+compiler:
+  - gcc
+before_install:
+ #- sudo apt-get install libboost-chrono1.48-dev libboost-regex1.48-dev libboost-system1.48-dev libboost-thread1.48-dev libboost-test1.48-dev libboost-random1.48-dev -y
+ - sudo add-apt-repository -y ppa:boost-latest/ppa && sudo apt-get update -q && sudo apt-get install -y libboost-chrono1.55-dev libboost-random1.55-dev libboost-regex1.55-dev libboost-system1.55-dev libboost-thread1.55-dev libboost-test1.55-dev
+env:
+  global:
+    - BOOST_INCLUDES=/usr/include
+    - BOOST_LIBS=/usr/lib/x86_64-linux-gnu
+script: scons -j 2 && scons test
+branches:
+  only:
+    - master
+    - develop
+notifications:
+  recipients:
+    - travis@zaphoyd.com
+  email:
+    on_success: change
+    on_failure: always
diff --git a/vendor/websocketpp/CMakeLists.txt b/vendor/websocketpp/CMakeLists.txt
new file mode 100644
index 0000000..f60caa1
--- /dev/null
+++ b/vendor/websocketpp/CMakeLists.txt
@@ -0,0 +1,261 @@
+
+############ Setup project and cmake
+
+# Project name
+project (websocketpp)
+
+# Minimum cmake requirement. We should require a quite recent
+# cmake for the dependency find macros etc. to be up to date.
+cmake_minimum_required (VERSION 2.6)
+
+set (WEBSOCKETPP_MAJOR_VERSION 0)
+set (WEBSOCKETPP_MINOR_VERSION 7)
+set (WEBSOCKETPP_PATCH_VERSION 0)
+set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
+
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
+if (WIN32 AND NOT CYGWIN)
+  set (DEF_INSTALL_CMAKE_DIR cmake)
+else ()
+  set (DEF_INSTALL_CMAKE_DIR lib/cmake/websocketpp)
+endif ()
+set (INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Installation directory for CMake files")
+
+# Make relative paths absolute (needed later on)
+foreach (p INCLUDE CMAKE)
+  set (var INSTALL_${p}_DIR)
+  if (NOT IS_ABSOLUTE "${${var}}")
+    set (${var} "${CMAKE_INSTALL_PREFIX}/${${var}}")
+  endif ()
+endforeach ()
+
+# Set CMake library search policy
+if (COMMAND cmake_policy)
+    cmake_policy (SET CMP0003 NEW)
+    cmake_policy (SET CMP0005 NEW)
+endif ()
+
+# Disable unnecessary build types
+set (CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo;Debug" CACHE STRING "Configurations" FORCE)
+
+# Include our cmake macros
+set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+include (CMakeHelpers)
+
+############ Paths
+
+set (WEBSOCKETPP_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+set (WEBSOCKETPP_INCLUDE ${WEBSOCKETPP_ROOT}/websocketpp)
+set (WEBSOCKETPP_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR})
+set (WEBSOCKETPP_BIN ${WEBSOCKETPP_BUILD_ROOT}/bin)
+set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib)
+
+# CMake install step prefix. I assume linux users want the prefix to
+# be the default /usr or /usr/local so this is only adjusted on Windows.
+# - Windows: Build the INSTALL project in your solution file.
+# - Linux/OSX: make install.
+if (MSVC)
+    set (CMAKE_INSTALL_PREFIX "${WEBSOCKETPP_ROOT}/install")
+endif ()
+
+############  Build customization
+
+# Override from command line "CMake -D<OPTION>=TRUE/FALSE/0/1/ON/OFF"
+option (ENABLE_CPP11 "Build websocketpp with CPP11 features enabled." TRUE)
+option (BUILD_EXAMPLES "Build websocketpp examples." FALSE)
+option (BUILD_TESTS "Build websocketpp tests." FALSE)
+
+if (BUILD_TESTS OR BUILD_EXAMPLES)
+
+    enable_testing ()
+
+    ############ Compiler specific setup
+
+    set (WEBSOCKETPP_PLATFORM_LIBS "")
+    set (WEBSOCKETPP_PLATFORM_TLS_LIBS "")
+    set (WEBSOCKETPP_BOOST_LIBS "")
+
+    # VC9 and C++11 reasoning
+    if (ENABLE_CPP11 AND MSVC AND MSVC90)
+        message("* Detected Visual Studio 9 2008, disabling C++11 support.")
+        set (ENABLE_CPP11 FALSE)
+    endif ()
+
+    # Detect clang. Not officially reported by cmake.
+    execute_process(COMMAND "${CMAKE_CXX_COMPILER}" "-v" ERROR_VARIABLE CXX_VER_STDERR)
+    if ("${CXX_VER_STDERR}" MATCHES ".*clang.*")
+        set (CMAKE_COMPILER_IS_CLANGXX 1)
+    endif ()
+
+    # C++11 defines
+    if (ENABLE_CPP11)
+        if (MSVC)
+            add_definitions (-D_WEBSOCKETPP_CPP11_FUNCTIONAL_)
+            add_definitions (-D_WEBSOCKETPP_CPP11_SYSTEM_ERROR_)
+            add_definitions (-D_WEBSOCKETPP_CPP11_RANDOM_DEVICE_)
+            add_definitions (-D_WEBSOCKETPP_CPP11_MEMORY_)
+        else()
+            add_definitions (-D_WEBSOCKETPP_CPP11_STL_)
+        endif()
+    endif ()
+
+    # Visual studio
+    if (MSVC)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
+        set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /GL /Gy /GF /Ox /Ob2 /Ot /Oi /MP /arch:SSE2 /fp:fast")
+        set (CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /LTCG /INCREMENTAL:NO /OPT:REF /OPT:ICF")
+        add_definitions (/W3 /wd4996 /wd4995 /wd4355)
+        add_definitions (-DUNICODE -D_UNICODE)
+        add_definitions (-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
+        add_definitions (-DNOMINMAX)
+    endif ()
+
+    # g++
+    if (CMAKE_COMPILER_IS_GNUCXX)
+        set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
+        set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
+        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+        if (NOT APPLE)
+            add_definitions (-DNDEBUG -Wall -Wcast-align) # todo: should we use CMAKE_C_FLAGS for these?
+        endif ()
+
+        # Try to detect version. Note: Not tested!
+        execute_process (COMMAND ${CMAKE_CXX_COMPILER} "-dumpversion" OUTPUT_VARIABLE GCC_VERSION)
+        if ("${GCC_VERSION}" STRGREATER "4.4.0")
+            message("* C++11 support partially enabled due to GCC version ${GCC_VERSION}")
+            set (WEBSOCKETPP_BOOST_LIBS system thread)
+        endif ()
+    endif ()
+
+    # clang
+    if (CMAKE_COMPILER_IS_CLANGXX)
+        if (NOT APPLE)
+            set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
+        else()
+            set (WEBSOCKETPP_PLATFORM_LIBS pthread)
+        endif()
+        set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+        set (WEBSOCKETPP_BOOST_LIBS system thread)
+        set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
+        if (NOT APPLE)
+            add_definitions (-DNDEBUG -Wall -Wno-padded) # todo: should we use CMAKE_C_FLAGS for these?
+        endif ()
+    endif ()
+
+    # OSX, can override above.
+    if (APPLE)
+        add_definitions (-DNDEBUG -Wall)
+    endif ()
+
+    if (BUILD_EXAMPLES)
+        list (APPEND WEBSOCKETPP_BOOST_LIBS random)
+    endif()
+
+    if (BUILD_TESTS)
+        list (APPEND WEBSOCKETPP_BOOST_LIBS unit_test_framework)
+    endif()
+
+    ############ Dependencies
+
+    # Set BOOST_ROOT env variable or pass with cmake -DBOOST_ROOT=path.
+    # BOOST_ROOT can also be defined by a previous run from cmake cache.
+    if (NOT "$ENV{BOOST_ROOT_CPP11}" STREQUAL "")
+        # Scons documentation for BOOST_ROOT_CPP11:
+        # "look for optional second boostroot compiled with clang's libc++ STL library
+        # this prevents warnings/errors when linking code built with two different
+        # incompatible STL libraries."
+        file (TO_CMAKE_PATH "$ENV{BOOST_ROOT_CPP11}" BOOST_ROOT)
+        set (BOOST_ROOT ${BOOST_ROOT} CACHE PATH "BOOST_ROOT dependency path" FORCE)
+    endif ()
+    if ("${BOOST_ROOT}" STREQUAL "")
+        file (TO_CMAKE_PATH "$ENV{BOOST_ROOT}" BOOST_ROOT)
+        # Cache BOOST_ROOT for runs that do not define $ENV{BOOST_ROOT}.
+        set (BOOST_ROOT ${BOOST_ROOT} CACHE PATH "BOOST_ROOT dependency path" FORCE)
+    endif ()
+
+    message ("* Configuring Boost")
+    message (STATUS "-- Using BOOST_ROOT")
+    message (STATUS "       " ${BOOST_ROOT})
+
+    if (MSVC)
+        set (Boost_USE_MULTITHREADED TRUE)
+        set (Boost_USE_STATIC_LIBS TRUE)
+    else ()
+        set (Boost_USE_MULTITHREADED FALSE)
+        set (Boost_USE_STATIC_LIBS FALSE)
+    endif ()
+
+	if (BOOST_STATIC)
+		set (Boost_USE_STATIC_LIBS TRUE)
+	endif ()
+
+    if (NOT Boost_USE_STATIC_LIBS)
+        add_definitions (/DBOOST_TEST_DYN_LINK)
+    endif ()
+
+    set (Boost_FIND_REQUIRED TRUE)
+    set (Boost_FIND_QUIETLY TRUE)
+    set (Boost_DEBUG FALSE)
+    set (Boost_USE_MULTITHREADED TRUE)
+    set (Boost_ADDITIONAL_VERSIONS "1.39.0" "1.40.0" "1.41.0" "1.42.0" "1.43.0" "1.44.0" "1.46.1") # todo: someone who knows better spesify these!
+
+    find_package (Boost 1.39.0 COMPONENTS "${WEBSOCKETPP_BOOST_LIBS}")
+
+    if (Boost_FOUND)
+        # Boost is a project wide global dependency.
+        include_directories (${Boost_INCLUDE_DIRS})
+        link_directories (${Boost_LIBRARY_DIRS})
+
+        # Pretty print status
+        message (STATUS "-- Include Directories")
+        foreach (include_dir ${Boost_INCLUDE_DIRS})
+            message (STATUS "       " ${include_dir})
+        endforeach ()
+        message (STATUS "-- Library Directories")
+        foreach (library_dir ${Boost_LIBRARY_DIRS})
+            message (STATUS "       " ${library_dir})
+        endforeach ()
+        message (STATUS "-- Libraries")
+        foreach (boost_lib ${Boost_LIBRARIES})
+            message (STATUS "       " ${boost_lib})
+        endforeach ()
+        message ("")
+    else ()
+        message (FATAL_ERROR "Failed to find required dependency: boost")
+    endif ()
+
+    find_package(OpenSSL)
+    find_package(ZLIB)
+endif()
+
+############ Add projects
+
+# Add main library
+add_subdirectory (websocketpp)
+
+# Add examples
+if (BUILD_EXAMPLES)
+    include_subdirs ("examples")
+endif ()
+
+# Add tests
+if (BUILD_TESTS)
+    include_subdirs ("test")
+endif ()
+
+print_used_build_config()
+
+export (PACKAGE websocketpp)
+
+configure_file (websocketpp-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake" @ONLY)
+configure_file (websocketpp-configVersion.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake" @ONLY)
+
+# Install the websocketpp-config.cmake and websocketpp-configVersion.cmake
+install (FILES
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake"
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
+  DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
+
diff --git a/vendor/websocketpp/COPYING b/vendor/websocketpp/COPYING
new file mode 100644
index 0000000..f8cc5ba
--- /dev/null
+++ b/vendor/websocketpp/COPYING
@@ -0,0 +1,145 @@
+Main Library:
+
+Copyright (c) 2014, Peter Thorson. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of the WebSocket++ Project nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Bundled Libraries:
+
+****** Base 64 Library (base64/base64.hpp) ******
+base64.hpp is a repackaging of the base64.cpp and base64.h files into a
+single header suitable for use as a header only library. This conversion was
+done by Peter Thorson (webmaster@zaphoyd.com) in 2012. All modifications to
+the code are redistributed under the same license as the original, which is
+listed below.
+
+base64.cpp and base64.h
+
+Copyright (C) 2004-2008 René Nyffenegger
+
+This source code is provided 'as-is', without any express or implied
+warranty. In no event will the author be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this source code must not be misrepresented; you must not
+  claim that you wrote the original source code. If you use this source code
+  in a product, an acknowledgment in the product documentation would be
+  appreciated but is not required.
+
+2. Altered source versions must be plainly marked as such, and must not be
+  misrepresented as being the original source code.
+
+3. This notice may not be removed or altered from any source distribution.
+
+René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+
+****** SHA1 Library (sha1/sha1.hpp) ******
+sha1.hpp is a repackaging of the sha1.cpp and sha1.h files from the shallsha1
+library (http://code.google.com/p/smallsha1/) into a single header suitable for
+use as a header only library. This conversion was done by Peter Thorson
+(webmaster@zaphoyd.com) in 2013. All modifications to the code are redistributed
+under the same license as the original, which is listed below.
+
+ Copyright (c) 2011, Micael Hildenborg
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Micael Hildenborg nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY Micael Hildenborg ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL Micael Hildenborg BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+****** MD5 Library (common/md5.hpp) ******
+md5.hpp is a reformulation of the md5.h and md5.c code from
+http://www.opensource.apple.com/source/cups/cups-59/cups/md5.c to allow it to
+function as a component of a header only library. This conversion was done by
+Peter Thorson (webmaster@zaphoyd.com) in 2012 for the WebSocket++ project. The
+changes are released under the same license as the original (listed below)
+
+Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the authors be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.
+
+L. Peter Deutsch
+ghost@aladdin.com
+
+****** UTF8 Validation logic (utf8_validation.hpp) ******
+utf8_validation.hpp is adapted from code originally written by Bjoern Hoehrmann
+<bjoern@hoehrmann.de>. See http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for
+details.
+
+The original license:
+
+Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/vendor/websocketpp/Doxyfile b/vendor/websocketpp/Doxyfile
new file mode 100644
index 0000000..d7508f4
--- /dev/null
+++ b/vendor/websocketpp/Doxyfile
@@ -0,0 +1,2355 @@
+# Doxyfile 1.8.8
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = WebSocket++
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 0.7.0
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          = "C++ websocket client/server library"
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           = 
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = doxygen
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = 
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = 
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                = 
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              = 
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      = 
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = YES
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = 
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            = 
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = readme.md \
+                         changelog.md \
+                         roadmap.md \
+                         websocketpp \
+                         tutorials \
+                         docs
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          = 
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = YES
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                = build
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       = 
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        = 
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           = 
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = 
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             = 
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           = 
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        = 
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS = 
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = YES
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES, then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# compiled with the --with-libclang option.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = YES
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            = 
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            = 
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        = 
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra stylesheet files is of importance (e.g. the last
+# stylesheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  = docs/manual.css
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       = 
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 236
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 0
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 148
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               = 
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           = 
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     = 
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           = 
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     = 
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       = 
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       = 
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     = 
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         = 
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string,
+# for the replacement values of the other commands the user is refered to
+# HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           = 
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           = 
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      = 
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    = 
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             = 
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX = 
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           = 
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  = 
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = 
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      = 
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               = 
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       = 
+
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            = 
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               = 
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           = 
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               = 
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           = 
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           = 
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           = 
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+PLANTUML_JAR_PATH      = 
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/vendor/websocketpp/SConstruct b/vendor/websocketpp/SConstruct
new file mode 100644
index 0000000..ef7d5bf
--- /dev/null
+++ b/vendor/websocketpp/SConstruct
@@ -0,0 +1,281 @@
+import os, sys, commands
+env = Environment(ENV = os.environ)
+
+# figure out a better way to configure this
+if os.environ.has_key('CXX'):
+    env['CXX'] = os.environ['CXX']
+
+if os.environ.has_key('DEBUG'):
+    env['DEBUG'] = os.environ['DEBUG']
+
+if os.environ.has_key('CXXFLAGS'):
+    #env['CXXFLAGS'] = os.environ['CXXFLAGS']
+    env.Append(CXXFLAGS = os.environ['CXXFLAGS'])
+
+if os.environ.has_key('LINKFLAGS'):
+    #env['LDFLAGS'] = os.environ['LDFLAGS']
+    env.Append(LINKFLAGS = os.environ['LINKFLAGS'])
+
+## Boost
+##
+## Note: You need to either set BOOSTROOT to the root of a stock Boost distribution
+## or set BOOST_INCLUDES and BOOST_LIBS if Boost comes with your OS distro e.g. and
+## needs BOOST_INCLUDES=/usr/include/boost and BOOST_LIBS=/usr/lib like Ubuntu.
+##
+if os.environ.has_key('BOOSTROOT'):
+    os.environ['BOOST_ROOT'] = os.environ['BOOSTROOT']
+
+if os.environ.has_key('BOOST_ROOT'):
+   env['BOOST_INCLUDES'] = os.environ['BOOST_ROOT']
+   env['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT'], 'stage', 'lib')
+elif os.environ.has_key('BOOST_INCLUDES') and os.environ.has_key('BOOST_LIBS'):
+   env['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES']
+   env['BOOST_LIBS'] = os.environ['BOOST_LIBS']
+else:
+   raise SCons.Errors.UserError, "Neither BOOST_ROOT, nor BOOST_INCLUDES + BOOST_LIBS was set!"
+
+## Custom OpenSSL
+if os.environ.has_key('OPENSSL_PATH'):
+   env.Append(CPPPATH = os.path.join(os.environ['OPENSSL_PATH'], 'include'))
+   env.Append(LIBPATH = os.environ['OPENSSL_PATH'])
+
+if os.environ.has_key('WSPP_ENABLE_CPP11'):
+   env['WSPP_ENABLE_CPP11'] = True
+else:
+   env['WSPP_ENABLE_CPP11'] = False
+
+boost_linkshared = False
+
+def boostlibs(libnames,localenv):
+   if localenv['PLATFORM'].startswith('win'):
+      # Win/VC++ supports autolinking. nothing to do.
+      # http://www.boost.org/doc/libs/1_49_0/more/getting_started/windows.html#auto-linking
+      return []
+   else:
+      libs = []
+      prefix = localenv['SHLIBPREFIX'] if boost_linkshared else localenv['LIBPREFIX']
+      suffix = localenv['SHLIBSUFFIX'] if boost_linkshared else localenv['LIBSUFFIX']
+      for name in libnames:
+         lib = File(os.path.join(localenv['BOOST_LIBS'], '%sboost_%s%s' % (prefix, name, suffix)))
+         libs.append(lib)
+      return libs
+
+if env['PLATFORM'].startswith('win'):
+   env.Append(CPPDEFINES = ['WIN32',
+                            'NDEBUG',
+                            'WIN32_LEAN_AND_MEAN',
+                            '_WIN32_WINNT=0x0600',
+                            '_CONSOLE',
+                            'BOOST_TEST_DYN_LINK',
+                            'NOMINMAX',
+                            '_WEBSOCKETPP_CPP11_MEMORY_',
+                            '_WEBSOCKETPP_CPP11_FUNCTIONAL_'])
+   arch_flags  = '/arch:SSE2'
+   opt_flags   = '/Ox /Oi /fp:fast'
+   warn_flags  = '/W3 /wd4996 /wd4995 /wd4355'
+   env['CCFLAGS'] = '%s /EHsc /GR /GS- /MD /nologo %s %s' % (warn_flags, arch_flags, opt_flags)
+   env['LINKFLAGS'] = '/INCREMENTAL:NO /MANIFEST /NOLOGO /OPT:REF /OPT:ICF /MACHINE:X86'
+elif env['PLATFORM'] == 'posix':
+   if env.has_key('DEBUG'):
+      env.Append(CCFLAGS = ['-g', '-O0'])
+   else:
+      env.Append(CPPDEFINES = ['NDEBUG'])
+      env.Append(CCFLAGS = ['-O1', '-fomit-frame-pointer'])
+   env.Append(CCFLAGS = ['-Wall'])
+   #env['LINKFLAGS'] = ''
+elif env['PLATFORM'] == 'darwin':
+   if not os.environ.has_key('CXX'):
+      env['CXX'] = "clang++"
+   if env.has_key('DEBUG'):
+      env.Append(CCFLAGS = ['-g', '-O0'])
+   else:
+      env.Append(CPPDEFINES = ['NDEBUG'])
+      env.Append(CCFLAGS = ['-O1', '-fomit-frame-pointer'])
+   env.Append(CCFLAGS = ['-Wall'])
+   #env['LINKFLAGS'] = ''
+
+if env['PLATFORM'].startswith('win'):
+   #env['LIBPATH'] = env['BOOST_LIBS']
+   pass
+else:
+   env.Append(LIBPATH = ['/usr/lib', '/usr/local/lib'])
+
+# Compiler specific warning flags
+if env['CXX'].startswith('g++'):
+   #env.Append(CCFLAGS = ['-Wconversion'])
+   env.Append(CCFLAGS = ['-Wcast-align'])
+   env.Append(CCFLAGS = ['-Wshadow'])
+   env.Append(CCFLAGS = ['-Wunused-parameter'])
+elif env['CXX'].startswith('clang++'):
+   #env.Append(CCFLAGS = ['-Wcast-align'])
+   #env.Append(CCFLAGS = ['-Wglobal-constructors'])
+   #env.Append(CCFLAGS = ['-Wconversion'])
+   env.Append(CCFLAGS = ['-Wno-padded'])
+   env.Append(CCFLAGS = ['-Wshadow'])
+   env.Append(CCFLAGS = ['-Wunused-parameter'])
+
+   env.Append(CCFLAGS = ['-Wsometimes-uninitialized'])
+   env.Append(CCFLAGS = ['-Wuninitialized'])
+
+   #env.Append(CCFLAGS = ['-Weverything'])
+   #env.Append(CCFLAGS = ['-Wno-documentation'])
+   #env.Append(CCFLAGS = ['-Wno-weak-vtables'])
+   #env.Append(CCFLAGS = ['-Wno-global-constructors'])
+   #env.Append(CCFLAGS = ['-Wno-sign-conversion'])
+   #env.Append(CCFLAGS = ['-Wno-exit-time-destructors'])
+
+
+
+
+   # Wpadded
+   # Wsign-conversion
+   #
+
+platform_libs = []
+tls_libs = []
+
+tls_build = False
+
+if env['PLATFORM'] == 'posix':
+   platform_libs = ['pthread', 'rt']
+   tls_libs = ['ssl', 'crypto']
+   tls_build = True
+elif env['PLATFORM'] == 'darwin':
+   tls_libs = ['ssl', 'crypto']
+   tls_build = True
+elif env['PLATFORM'].startswith('win'):
+   # Win/VC++ supports autolinking. nothing to do.
+   pass
+
+## Append WebSocket++ path
+env.Append(CPPPATH = ['#'])
+
+##### Set up C++11 environment
+polyfill_libs = [] # boost libraries used as drop in replacements for incomplete
+                   # C++11 STL implementations
+env_cpp11 = env.Clone ()
+
+if env_cpp11['CXX'].startswith('g++'):
+   # TODO: check g++ version
+   GCC_VERSION = commands.getoutput(env_cpp11['CXX'] + ' -dumpversion')
+
+   if GCC_VERSION > "4.4.0":
+      print "C++11 build environment partially enabled"
+      env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x'],TOOLSET = ['g++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
+   else:
+      print "C++11 build environment is not supported on this version of G++"
+elif env_cpp11['CXX'].startswith('clang++'):
+   print "C++11 build environment enabled"
+   env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++'])
+   env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
+
+   # look for optional second boostroot compiled with clang's libc++ STL library
+   # this prevents warnings/errors when linking code built with two different
+   # incompatible STL libraries.
+   if os.environ.has_key('BOOST_ROOT_CPP11'):
+      env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_ROOT_CPP11']
+      env_cpp11['BOOST_LIBS'] = os.path.join(os.environ['BOOST_ROOT_CPP11'], 'stage', 'lib')
+   elif os.environ.has_key('BOOST_INCLUDES_CPP11') and os.environ.has_key('BOOST_LIBS_CPP11'):
+      env_cpp11['BOOST_INCLUDES'] = os.environ['BOOST_INCLUDES_CPP11']
+      env_cpp11['BOOST_LIBS'] = os.environ['BOOST_LIBS_CPP11']
+else:
+   print "C++11 build environment disabled"
+
+# if the build system is known to allow the isystem modifier for library include
+# values then use it for the boost libraries. Otherwise just add them to the
+# regular CPPPATH values.
+if env['CXX'].startswith('g++') or env['CXX'].startswith('clang'):
+    env.Append(CPPFLAGS = '-isystem ' + env['BOOST_INCLUDES'])
+else:
+    env.Append(CPPPATH = [env['BOOST_INCLUDES']])
+env.Append(LIBPATH = [env['BOOST_LIBS']])
+
+# if the build system is known to allow the isystem modifier for library include
+# values then use it for the boost libraries. Otherwise just add them to the
+# regular CPPPATH values.
+if env_cpp11['CXX'].startswith('g++') or env_cpp11['CXX'].startswith('clang'):
+    env_cpp11.Append(CPPFLAGS = '-isystem ' + env_cpp11['BOOST_INCLUDES'])
+else:
+    env_cpp11.Append(CPPPATH = [env_cpp11['BOOST_INCLUDES']])
+env_cpp11.Append(LIBPATH = [env_cpp11['BOOST_LIBS']])
+
+releasedir = 'build/release/'
+debugdir = 'build/debug/'
+testdir = 'build/test/'
+builddir = releasedir
+
+Export('env')
+Export('env_cpp11')
+Export('platform_libs')
+Export('boostlibs')
+Export('tls_libs')
+Export('polyfill_libs')
+
+## END OF CONFIG !!
+
+## TARGETS:
+
+if not env['PLATFORM'].startswith('win'):
+    # Unit tests, add test folders with SConscript files to to_test list.
+    to_test = ['utility','http','logger','random','processors','message_buffer','extension','transport/iostream','transport/asio','roles','endpoint','connection','transport'] #,'http','processors','connection'
+
+    for t in to_test:
+       new_tests = SConscript('#/test/'+t+'/SConscript',variant_dir = testdir + t, duplicate = 0)
+       for a in new_tests:
+          new_alias = Alias('test', [a], a.abspath)
+          AlwaysBuild(new_alias)
+
+# Main test application
+#main = SConscript('#/examples/dev/SConscript',variant_dir = builddir + 'dev',duplicate = 0)
+
+# echo_server
+echo_server = SConscript('#/examples/echo_server/SConscript',variant_dir = builddir + 'echo_server',duplicate = 0)
+
+# echo_client
+echo_client = SConscript('#/examples/echo_client/SConscript',variant_dir = builddir + 'echo_client',duplicate = 0)
+
+# echo_server_tls
+if tls_build:
+    echo_server_tls = SConscript('#/examples/echo_server_tls/SConscript',variant_dir = builddir + 'echo_server_tls',duplicate = 0)
+    echo_server_both = SConscript('#/examples/echo_server_both/SConscript',variant_dir = builddir + 'echo_server_both',duplicate = 0)
+
+# broadcast_server
+broadcast_server = SConscript('#/examples/broadcast_server/SConscript',variant_dir = builddir + 'broadcast_server',duplicate = 0)
+
+# testee_server
+testee_server = SConscript('#/examples/testee_server/SConscript',variant_dir = builddir + 'testee_server',duplicate = 0)
+
+# testee_client
+testee_client = SConscript('#/examples/testee_client/SConscript',variant_dir = builddir + 'testee_client',duplicate = 0)
+
+# scratch_client
+scratch_client = SConscript('#/examples/scratch_client/SConscript',variant_dir = builddir + 'scratch_client',duplicate = 0)
+
+# scratch_server
+scratch_server = SConscript('#/examples/scratch_server/SConscript',variant_dir = builddir + 'scratch_server',duplicate = 0)
+
+
+# debug_client
+debug_client = SConscript('#/examples/debug_client/SConscript',variant_dir = builddir + 'debug_client',duplicate = 0)
+
+# debug_server
+debug_server = SConscript('#/examples/debug_server/SConscript',variant_dir = builddir + 'debug_server',duplicate = 0)
+
+# subprotocol_server
+subprotocol_server = SConscript('#/examples/subprotocol_server/SConscript',variant_dir = builddir + 'subprotocol_server',duplicate = 0)
+
+# telemetry_server
+telemetry_server = SConscript('#/examples/telemetry_server/SConscript',variant_dir = builddir + 'telemetry_server',duplicate = 0)
+
+# external_io_service
+external_io_service = SConscript('#/examples/external_io_service/SConscript',variant_dir = builddir + 'external_io_service',duplicate = 0)
+
+if not env['PLATFORM'].startswith('win'):
+    # iostream_server
+    iostream_server = SConscript('#/examples/iostream_server/SConscript',variant_dir = builddir + 'iostream_server',duplicate = 0)
+
+    # telemetry_client
+    telemetry_client = SConscript('#/examples/telemetry_client/SConscript',variant_dir = builddir + 'telemetry_client',duplicate = 0)
+
+    # print_server
+    print_server = SConscript('#/examples/print_server/SConscript',variant_dir = builddir + 'print_server',duplicate = 0)
diff --git a/vendor/websocketpp/changelog.md b/vendor/websocketpp/changelog.md
new file mode 100644
index 0000000..15846ce
--- /dev/null
+++ b/vendor/websocketpp/changelog.md
@@ -0,0 +1,342 @@
+HEAD
+
+0.7.0 - 2016-02-22
+- MINOR BREAKING SOCKET POLICY CHANGE: Asio transport socket policy method 
+  `cancel_socket` will now return `lib::asio::error_code` instead of `void`.
+  Custom Asio transport socket policies will need to be updated accordingly.
+  This does not affect anyone using the bundled socket policies.
+- Feature: Basic support for the permessage-deflate extension. #344
+- Feature: Allow accessing the local endpoint when using the Asio transport.
+  This allows inspection of the address and port in cases where they are chosen
+  by the operating system rather than the user. Thank you Andreas Weis and 
+  Muzahid Hussain for reporting and related code. #458
+- Feature: Add support for subprotocols in Hybi00. Thank you Lukas Obermann
+  for reporting and a patch. #518
+- Improvement: Better automatic std::chrono feature detection for Visual Studio
+- Improvement: Major refactoring to bundled CMake build system. CMake can now be
+  used to build all of the examples and the test suite. Thank you Thijs Wenker
+  for a significant portion of this code. #378, #435, #449
+- Improvement: In build environments where `lib::error_code` and 
+  `lib::asio::error_code` match (such as using `boost::asio` with 
+  `boost::system_error` or standalone asio with `std::system_error`, transport
+  errors are passed through natively rather than being reported as a translated 
+  `pass_through` error type.
+- Improvement: Add a `get_transport_error` method to Asio transport connections
+  to allow retrieving a machine readable native transport error.
+- Improvement: Add `connection::get_response`, `connection::get_response_code`,
+  and `connection::get_response_msg` methods to allow accessing additional
+  information about the HTTP responses that WebSocket++ sends. #465 Thank you
+  Flow86 for reporting.
+- Improvement: Removes use of empty strings ("") in favor of `string::clear()`
+  and `string::empty()`. This avoids generating unnecessary temporary objects.
+  #468 Thank you Vladislav Yaroslavlev for reporting and a patch.
+- Documentation: Adds an example demonstrating the use of external `io_service`
+- Documentation: Adds a simple echo_client example.
+- Documentation: Begins migration of the web based user manual into Doxygen.
+- Bug: Fix memory leak when init_asio produces an error. #454 Thank you Mark 
+  Grimes for reporting and fixing.
+- Bug: Fix crash when processing a specially crafted HTTP header. Thank you Eli 
+  Fidler for reporting, test cases, and a patch. #456
+- Bug: Fix an issue where standalone Asio builds that use TLS would not compile
+  due to lingering boost code. #448 Thank you mjsp for reporting
+- Bug: Fix an issue where canceling a socket could throw an exception on some
+  older Windows XP platforms. It now prints an appropriate set of log messages
+  instead. Thank you Thijs Wenker for reporting and researching solutions. #460
+- Bug: Fix an issue where deferred HTTP connections that start sending a very 
+  long response before their HTTP handler ends would result in a second set of
+  HTTP headers being injected into the output. Thank you Kevin Smith for
+  reporting and providing test case details. #443
+- Bug: Fix an issue where the wrong type of strand was being created. Thank you 
+  Bastien Brunnenstein for reporting and a patch. #462
+- Bug: Fix an issue where TLS includes were broken for Asio Standalone builds.
+  Thank you giachi and Bastien Brunnenstein for reporting. #491
+- Bug: Remove the use of cached read and write handlers in the Asio transport.
+  This feature caused memory leaks when the io_service the connection was
+  running on was abruptly stopped. There isn't a clean and safe way of using
+  this optimization without global state and the associated locks. The locks
+  perform worse. Thank you Xavier Gibert for reporting, test cases, and code.
+  Fixes #490.
+- Bug: Fix a heap buffer overflow when checking very short URIs. Thank you 
+  Xavier Gibert for reporting and a patch #524
+- Compatibility: Fixes a number of build & config issues on Visual Studio 2015
+- Compatibility: Removes non-standards compliant masking behavior. #395, #469
+- Compatibility: Replace deprecated use of auto_ptr on systems where unique_ptr
+  is available.
+
+0.6.0 - 2015-06-02
+- MINOR BREAKING TRANSPORT POLICY CHANGE: Custom transport policies will now be
+  required to include a new method `void set_uri(uri_ptr u)`. An implementation
+  is not required. The stub transport policy includes an example stub method
+  that can be added to any existing custom transport policy to fulfill this
+  requirement. This does not affect anyone using the bundled transports or
+  configs.
+- MINOR BREAKING SOCKET POLICY CHANGE: Custom asio transport socket policies 
+  will now be required to include a new method `void set_uri(uri_ptr u)`. Like
+  with the transport layer, an implementation is not required. This does not 
+  affect anyone using the bundled socket policies.
+- MINOR BREAKING DEPENDENCY CHANGE: When using Boost versions greater than or 
+  equal to 1.49 in C++03 mode, `libboost-chrono` is needed now instead of 
+  `libboost-date_time`. Users with C++11 compilers or using Boost versions 1.48
+  and earlier are not affected. Note: This change affects the bundled unit test
+  suite.
+- Feature: WebSocket++ Asio transport policy can now be used with the standalone
+  version of Asio (1.8.0+) when a C++11 compiler and standard library are 
+  present. This means that it is possible now to use WebSocket++'s Asio
+  transport entirely without Boost. Thank you Robert Seiler for proof of concept
+  code that was used as a guide for this implementation. Fixes #324 
+- Feature: Adds a vectored/scatter-gather write handler to the iostream
+  transport.
+- Feature: Adds the ability to defer sending an HTTP response until sometime
+  after the `http_handler` is run. This allows processing of long running http
+  handlers to defer their response until it is ready without blocking the
+  network thread. references #425
+- Improvement: `echo_server_tls` has been update to demonstrate how to configure
+  it for Mozilla's recommended intermediate and modern TLS security profiles.
+- Improvement: `endpoint::set_timer` now uses a steady clock provided by 
+  `boost::chrono` or `std::chrono` where available instead of the non-monotonic
+  system clock. Thank you breyed for reporting. fixes #241
+- Improvement: Outgoing TLS connections to servers using the SNI extension to
+  choose a certificate will now work. Thank you moozzyk for reporting. 
+  Fixes #400
+- Improvement: Removes an unnecessary mutex lock in `get_con_from_hdl`.
+- Cleanup: Asio transport policy has been refactored to remove many Boost
+  dependencies. On C++03 compilers the `boost::noncopyable` dependency has been
+  removed and the `boost::date_time` dependency has been replaced with the newer
+  `boost::chrono` when possible. On C++11 compilers the `boost::aligned_storage`
+  and `boost::date_time` dependencies are gone, replaced with equivalent C++11
+  standard library features.
+- Bug: Fixes a potential dangling pointer and inconsistent error message
+  handling in `websocketpp::exception`. #432 Thank you Tom Swirly for the fix.
+
+0.5.1 - 2015-02-27
+- Bug: Fixes an issue where some frame data was counted against the max header
+  size limit, resulting in connections that included a lot of frame data
+  immediately after the opening handshake to fail.
+- Bug: Fix a typo in the name of the set method for `max_http_body_size`. #406
+  Thank you jplatte for reporting.
+
+0.5.0 - 2015-01-22
+- BREAKING UTILITY CHANGE: Deprecated methods `http::parser::parse_headers`,
+  `http::response::parse_complete`, and `http::request::parse_complete` have
+  been removed.
+- Security: Disabled SSLv3 in example servers.
+- Feature: Adds basic support for accessing HTTP request bodies in the http
+  handler. #181
+- Feature: Adds the ability to register a shutdown handler when using the
+  iostream transport. This provides a clean interface for triggering the shut
+  down of external sockets and other cleanup without hooking in to higher level
+  WebSocket handlers.
+- Feature: Adds the ability to register a write handler when using the iostream
+  transport. This handler can be used to handle transport output in place of
+  registering an ostream to write to.
+- Feature: Adds a new logging policy that outputs to syslog. #386 Thank you Tom
+  Hughes for submitting the initial version of this policy.
+- Improvement: Message payload logging now prints text for text messages rather
+  than binary.
+- Improvement: Overhaul of handshake state machine. Should make it impossible
+  for exceptions to bubble out of transport methods like `io_service::run`.
+- Improvement: Overhaul of handshake error reporting. Fail handler error codes
+  will be more detailed and precise. Adds new [fail] and [http] logging channels
+  that log failed websocket connections and successful HTTP connections
+  respectively. A new aggregate channel package, `alevel::access_core`, allows
+  enabling connect, disconnect, fail, and http together. Successful HTTP
+  connections will no longer trigger a fail handler.
+- Improvement: Ability to terminate connection during an http handler to cleanly
+  suppress the default outgoing HTTP response.
+- Documentation: Add Sending & Receiving Messages step to chapter one of the
+  `utility_client` tutorial. Update `utility_client` example to match.
+- Cleanup: Removes unused files & STL includes. Adds required STL includes.
+  Normalizes include order.
+- Bug: Fixes a fatal state error when a handshake response is completed
+  immediately after that handshake times out. #389
+- Bug: MinGW fixes; C++11 feature detection, localtime use. #393 Thank you
+  Schebb for reporting, code, and testing.
+- Bug: Fixes an issue where `websocketpp::exception::what()` could return an out
+  of scope pointer. #397 Thank you fabioang for reporting.
+- Bug: Fixes an issue where endpoints were not reset properly after a call to
+  `endpoint::listen` failed. #390 Thank you wyyqyl for reporting.
+
+0.4.0 - 2014-11-04
+- BREAKING API CHANGE: All WebSocket++ methods now throw an exception of type
+  `websocketpp::exception` which derives from `std::exception`. This normalizes
+  all exception types under the standard exception hierarchy and allows
+  WebSocket++ exceptions to be caught in the same statement as others. The error
+  code that was previously thrown is wrapped in the exception object and can be
+  accessed via the `websocketpp::exception::code()` method.
+- BREAKING API CHANGE: Custom logging policies have some new required
+  constructors that take generic config settings rather than pointers to
+  std::ostreams. This allows writing logging policies that do not involve the
+  use of std::ostream. This does not affect anyone using the built in logging
+  policies.
+- BREAKING UTILITY CHANGE: `websocketpp::lib::net::htonll` and
+  `websocketpp::lib::net::ntohll` have been prefixed with an underscore to avoid
+  conflicts with similarly named macros in some operating systems. If you are
+  using the WebSocket++ provided 64 bit host/network byte order functions you
+  will need to switch to the prefixed versions.
+- BREAKING UTILITY CHANGE: The signature of `base64_encode` has changed from
+  `websocketpp::base64_encode(unsigned char const *, unsigned int)` to
+  `websocketpp::base64_encode(unsigned char const *, size_t)`.
+- BREAKING UTILITY CHANGE: The signature of `sha1::calc` has changed from
+  `websocketpp::sha1::calc(void const *, int, unsigned char *)` to
+  `websocketpp::sha1::calc(void const *, size_t, unsigned char *)`
+- Feature: Adds incomplete `minimal_server` and `minimal_client` configs that
+  can be used to build custom configs without pulling in the dependencies of
+  `core` or `core_client`. These configs will offer a stable base config to
+  future-proof custom configs.
+- Improvement: Core library no longer has std::iostream as a dependency.
+  std::iostream is still required for the optional iostream logging policy and
+  iostream transport.
+- Bug: C++11 Chrono support was being incorrectly detected by the `boost_config`
+  header. Thank you Max Dmitrichenko for reporting and a patch.
+- Bug: use of `std::put_time` is now guarded by a unique flag rather than a
+  chrono library flag. Thank you Max Dmitrichenko for reporting.
+- Bug: Fixes non-thread safe use of std::localtime. #347 #383
+- Compatibility: Adjust usage of std::min to be more compatible with systems
+  that define a min(...) macro.
+- Compatibility: Removes unused parameters from all library, test, and example
+  code. This assists with those developing with -Werror and -Wunused-parameter
+  #376
+- Compatibility: Renames ntohll and htonll methods to avoid conflicts with
+  platform specific macros. #358 #381, #382 Thank you logotype, unphased,
+  svendjo
+- Cleanup: Removes unused functions, fixes variable shadow warnings, normalizes
+  all whitespace in library, examples, and tests to 4 spaces. #376
+
+0.3.0 - 2014-08-10
+- Feature: Adds `start_perpetual` and `stop_perpetual` methods to asio transport
+  These may be used to replace manually managed `asio::io_service::work` objects
+- Feature: Allow setting pong and handshake timeouts at runtime.
+- Feature: Allows changing the listen backlog queue length.
+- Feature: Split tcp init into pre and post init.
+- Feature: Adds URI method to extract query string from URI. Thank you Banaan
+  for code. #298
+- Feature: Adds a compile time switch to asio transport config to disable
+  certain multithreading features (some locks, asio strands)
+- Feature: Adds the ability to pause reading on a connection. Paused connections
+  will not read more data from their socket, allowing TCP flow control to work
+  without blocking the main thread.
+- Feature: Adds the ability to specify whether or not to use the `SO_REUSEADDR`
+  TCP socket option. The default for this value has been changed from `true` to
+  `false`.
+- Feature: Adds the ability to specify a maximum message size.
+- Feature: Adds `close::status::get_string(...)` method to look up a human
+  readable string given a close code value.
+- Feature: Adds `connection::read_all(...)` method to iostream transport as a
+  convenience method for reading all data into the connection buffer without the
+  end user needing to manually loop on `read_some`.
+- Improvement: Open, close, and pong timeouts can be disabled entirely by
+  setting their duration to 0.
+- Improvement: Numerous performance improvements. Including: tuned default
+  buffer sizes based on profiling, caching of handler binding for async
+  reads/writes, non-malloc allocators for read/write handlers, disabling of a
+  number of questionably useful range sanity checks in tight inner loops.
+- Improvement: Cleaned up the handling of TLS related errors. TLS errors will
+  now be reported with more detail on the info channel rather than all being
+  `tls_short_read` or `pass_through`. In addition, many cases where a TLS short
+  read was in fact expected are no longer classified as errors. Expected TLS
+  short reads and quasi-expected socket shutdown related errors will no longer
+  be reported as unclean WebSocket shutdowns to the application. Information
+  about them will remain in the info error channel for debugging purposes.
+- Improvement: `start_accept` and `listen` errors are now reported to the caller
+  either via an exception or an ec parameter.
+- Improvement: Outgoing writes are now batched for improved message throughput
+  and reduced system call and TCP frame overhead.
+- Bug: Fix some cases of calls to empty lib::function objects.
+- Bug: Fix memory leak of connection objects due to cached handlers holding on to
+  reference counted pointers. #310 Thank you otaras for reporting.
+- Bug: Fix issue with const endpoint accessors (such as `get_user_agent`) not
+  compiling due to non-const mutex use. #292 Thank you logofive for reporting.
+- Bug: Fix handler allocation crash with multithreaded `io_service`.
+- Bug: Fixes incorrect whitespace handling in header parsing. #301 Thank you
+  Wolfram Schroers for reporting
+- Bug: Fix a crash when parsing empty HTTP headers. Thank you Thingol for
+  reporting.
+- Bug: Fix a crash following use of the `stop_listening` function. Thank you
+  Thingol for reporting.
+- Bug: Fix use of variable names that shadow function parameters. The library
+  should compile cleanly with -Wshadow now. Thank you giszo for reporting. #318
+- Bug: Fix an issue where `set_open_handshake_timeout` was ignored by server
+  code. Thank you Robin Rowe for reporting.
+- Bug: Fix an issue where custom timeout values weren't being propagated from
+  endpoints to new connections.
+- Bug: Fix a number of memory leaks related to server connection failures. #323
+  #333 #334 #335 Thank you droppy and aydany for reporting and patches.
+  reporting.
+- Compatibility: Fix compile time conflict with Visual Studio's MIN/MAX macros.
+  Thank you Robin Rowe for reporting.
+- Documentation: Examples and test suite build system now defaults to clang on
+  OS X
+
+0.3.0-alpha4 - 2013-10-11
+- HTTP requests ending normally are no longer logged as errors. Thank you Banaan
+  for reporting. #294
+- Eliminates spurious expired timers in certain error conditions. Thank you
+  Banaan for reporting. #295
+- Consolidates all bundled library licenses into the COPYING file. #294
+- Updates bundled sha1 library to one with a cleaner interface and more
+  straight-forward license. Thank you lotodore for reporting and Evgeni Golov
+  for reviewing. #294
+- Re-introduces strands to asio transport, allowing `io_service` thread pools to
+  be used (with some limitations).
+- Removes endpoint code that kept track of a connection list that was never used
+  anywhere. Removes a lock and reduces connection creation/deletion complexity
+  from O(log n) to O(1) in the number of connections.
+- A number of internal changes to transport APIs
+- Deprecates iostream transport `readsome` in favor of `read_some` which is more
+  consistent with the naming of the rest of the library.
+- Adds preliminary signaling to iostream transport of eof and fatal transport
+  errors
+- Updates transport code to use shared pointers rather than raw pointers to
+  prevent asio from retaining pointers to connection methods after the
+  connection goes out of scope. #293 Thank you otaras for reporting.
+- Fixes an issue where custom headers couldn't be set for client connections
+  Thank you Jerry Win and Wolfram Schroers for reporting.
+- Fixes a compile error on visual studio when using interrupts. Thank you Javier
+  Rey Neira for reporting this.
+- Adds new 1012 and 1013 close codes per IANA registry
+- Add `set_remote_endpoint` method to iostream transport.
+- Add `set_secure` method to iostream transport.
+- Fix typo in .gitattributes file. Thank you jstarasov for reporting this. #280
+- Add missing locale include. Thank you Toninoso for reporting this. #281
+- Refactors `asio_transport` endpoint and adds full documentation and exception
+  free varients of all methods.
+- Removes `asio_transport` endpoint method cancel(). Use `stop_listen()` instead
+- Wrap internal `io_service` `run_one()` method
+- Suppress error when trying to shut down a connection that was already closed
+
+0.3.0-alpha3 - 2013-07-16
+- Minor refactor to bundled sha1 library
+- HTTP header comparisons are now case insensitive. #220, #275
+- Refactors URI to be exception free and not use regular expressions. This
+  eliminates the dependency on boost or C++11 regex libraries allowing native
+  C++11 usage on GCC 4.4 and higher and significantly reduces staticly built
+  binary sizes.
+- Updates handling of Server and User-Agent headers to better handle custom
+  settings and allow suppression of these headers for security purposes.
+- Fix issue where pong timeout handler always fired. Thank you Steven Klassen
+  for reporting this bug.
+- Add ping and pong endpoint wrapper methods
+- Add `get_request()` pass through method to connection to allow calling methods
+  specific to the HTTP policy in use.
+- Fix issue compile error with `WEBSOCKETPP_STRICT_MASKING` enabled and another
+  issue where `WEBSOCKETPP_STRICT_MASKING` was not applied to incoming messages.
+  Thank you Petter Norby for reporting and testing these bugs. #264
+- Add additional macro guards for use with boost_config. Thank you breyed
+  for testing and code. #261
+
+0.3.0-alpha2 - 2013-06-09
+- Fix a regression that caused servers being sent two close frames in a row
+  to end a connection uncleanly. #259
+- Fix a regression that caused spurious frames following a legitimate close
+  frames to erroneously trigger handlers. #258
+- Change default HTTP response error code when no http_handler is defined from
+  500/Internal Server Error to 426/Upgrade Required
+- Remove timezone from logger timestamp to work around issues with the Windows
+  implementation of strftime. Thank you breyed for testing and code. #257
+- Switch integer literals to char literals to improve VCPP compatibility.
+  Thank you breyed for testing and code. #257
+- Add MSVCPP warning suppression for the bundled SHA1 library. Thank you breyed
+  for testing and code. #257
+
+0.3.0-alpha1 - 2013-06-09
+- Initial Release
diff --git a/vendor/websocketpp/docs/faq.dox b/vendor/websocketpp/docs/faq.dox
new file mode 100644
index 0000000..c40f435
--- /dev/null
+++ b/vendor/websocketpp/docs/faq.dox
@@ -0,0 +1,86 @@
+/** \page faq FAQ
+
+## Dependency Management
+
+### Can WebSocket++ be used without Boost?
+Yes. WebSocket++ only uses Boost features as polyfills for C++11 language features and libraries. If you have a C++11 compiler and standard library you can use WebSocket++ without Boost. In most cases setting your build environment to use the C++11 (or later) language dialect is sufficient to enable this mode of use. 
+
+With less common compilers (and sometimes very recently release compilers) there may be specific issues with certain libraries that aren't automatically detected by the library. For these situations there are additional defines available to fine tune which C++11 libraries and features are used. TODO: more details about them.
+
+For the iostream/raw transport the C++11 standard library is sufficient. For the Asio based transports, there is no C++11 library that provides the networking capabilaties that Asio does. As such even with a C++11 build system, you will need a standalone copy of Asio to use if Boost Asio is not available.
+
+### Can WebSocket++ be used with standalone Asio
+Yes. The process is the same as used with standalone Asio itself. Define `ASIO_STANDALONE` before including Asio or WebSocket++ headers. You will need to download a copy of the Asio headers separately (http://www.think-async.com) and make sure they are in your build system's include path.
+
+### Can WebSocket++ be used without TLS or OpenSSL?
+Yes. When using the iostream/raw transport, there are no TLS features and OpenSSL is not required. When using the Asio transport TLS features are optional. You only need OpenSSL if you want to use TLS. You can only make or recieve encrypted connections (https/wss) if you have enabled TLS features.
+
+Whether an Asio endpoint uses TLS or not is determined by its config template parameter. The default bundled `websocketpp::config::asio` and `websocketpp::config::asio_client` configs do not support TLS, the `websocketpp::config::asio_tls` and `websocketpp::config::asio_tls_client` do.
+
+The `<websocketpp/config/asio.hpp>` and `<websocketpp/config/asio_client.hpp>` headers will include both the TLS and non-TLS varients of their respective configs and require the presence of OpenSSL. The `<websocketpp/config/asio_no_tls.hpp>` and `<websocketpp/config/asio_no_tls_client.hpp>` headers will include only the non-TLS configs and do not require OpenSSL.
+
+
+## Compression
+
+### How do I use permessage-deflate in version 0.6.0-permessagedeflate and 0.7.0?
+
+These versions of the library require a custom config to use the permessage-deflate extension. Here is a minimal example of such a custom config. You can also integrate these lines into an existing custom config.
+
+Note that in these versions there is no fine grained control over which connections are compressed or not. Clients will request compression with the default settings and use it if the server supports it. Servers will accept whatever parameters clients request.
+
+Outgoing messages by default will be compressed if compression was auto-negotiated during the handshake. There is an option to force a specific message to be sent uncompressed even if compression was negotiated. This may be useful for sending data that you know to be compressed already (images, zip files, etc).
+
+
+__Server Example__
+```
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+struct deflate_server_config : public websocketpp::config::asio {
+	// ... additional custom config if you need it for other things
+
+	/// permessage_compress extension
+    struct permessage_deflate_config {};
+
+    typedef websocketpp::extensions::permessage_deflate::enabled
+        <permessage_deflate_config> permessage_deflate_type;
+};
+
+typedef websocketpp::server<deflate_server_config> server_endpoint_type;
+```
+
+__Client Example__
+```
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+struct deflate_client_config : public websocketpp::config::asio_client {
+	// ... additional custom config if you need it for other things
+
+	/// permessage_compress extension
+    struct permessage_deflate_config {};
+
+    typedef websocketpp::extensions::permessage_deflate::enabled
+        <permessage_deflate_config> permessage_deflate_type;
+};
+
+typedef websocketpp::client<deflate_client_config> client_endpoint_type;
+```
+
+## Security
+
+### Is it possible to terminate a malicious connection quickly, without tying up resources performing clean close steps, 
+
+Yes. The library will automatically detect and terminate connections that violate the WebSocket protocol. In cases where the library believes the remote endpoint to be malicious or sufficiently broken to be unlikely to understand or process the closing handshake, it will be omited.
+
+If your application detects conditions above the protocol level that you believe to be malicious, for example, if you recognize an IP from a known denial of service attack, you can close the connection with two different levels of urgency. Use the standard `websocketpp::endpoint::close` or `websocketpp::connection::close` methods with one of the following special close codes:
+- `websocketpp::close::status::omit_handshake`: Omits the closing handshake, but cleanly closes the TCP connection.
+- `websocketpp::close::status::force_tcp_drop`: Forcibly drop the TCP connection.
+
+Please note that usage of these disconnect methods results in a violation of the WebSocket protocol and may have negative reprocusions for the remote endpoint with respect to network timeouts. Please use caution when using them.
+
+## Build Issues
+
+### Getting compile errors related to `std::chrono`, `boost::chrono`, `waitable_timer`, or `steady_clock`
+
+Your build system may be confused about whether it is supposed to be using `boost::chrono` or `std::chrono`. Boost automatically detects this setup on some compilers but not others. Defining `BOOST_ASIO_HAS_STD_CHRONO` can help. See http://www.boost.org/doc/libs/1_60_0/doc/html/boost_asio/overview/cpp2011/chrono.html for more details.
+
+*/
diff --git a/vendor/websocketpp/docs/getting_started.dox b/vendor/websocketpp/docs/getting_started.dox
new file mode 100644
index 0000000..d9a74c0
--- /dev/null
+++ b/vendor/websocketpp/docs/getting_started.dox
@@ -0,0 +1,27 @@
+/** \page getting_started Getting Started
+
+WebSocket++ code is available on github at https://github.com/zaphoyd/websocketpp
+The official project homepage lives at http://www.zaphoyd.com/websocketpp
+
+The git repository is organized into several directories:
+
+- **docs**: This documentation
+- **examples**: Example programs that demonstrate how to build basic versions of some commonly used patterns for WebSocket clients and servers.
+- **test**: Unit tests that confirm that the code you have works properly and help detect platform specific issues.
+- **tutorials**: Detailed walkthroughs of a select set of the example programs.
+- **websocketpp**: All of the library code and default configuration files.
+
+WebSocket++ is a header only library. You can start using it by including the websocketpp source directory in your project's include path and including the appropriate WebSocket++ headers in your program. You may also need to include and/or link to appropriate Boost/system libraries. TODO: More information: Building a program with WebSocket++, Walkthroughs of the example programs
+
+WebSocket++ includes cmake and scons scripts for building the examples and unit tests. Neither system is needed unless you want to build tests or examples in an automated fashion.
+
+__Usage questions__ should be posted to the project mailing list at http://groups.google.com/group/websocketpp/ or the IRC channel (\#websocketpp on freenode).
+
+__Bugs and issues__ should be posted to the project GitHub issues queue: https://github.com/zaphoyd/websocketpp/issues.
+
+__Pull requests__ on GitHub are welcome. Please make them against the `develop` branch.
+
+WebSocket++ is written and maintained by Peter Thorson. You can contact me via GitHub messaging, IRC, or via email at websocket@zaphoyd.com.
+
+*/
+
diff --git a/vendor/websocketpp/docs/handlers.dox b/vendor/websocketpp/docs/handlers.dox
new file mode 100644
index 0000000..d5abeb6
--- /dev/null
+++ b/vendor/websocketpp/docs/handlers.dox
@@ -0,0 +1,165 @@
+/** \page reference.handlers Handler Reference
+
+Handlers allow WebSocket++ programs to receive notifications about events
+that happen in relation to their connections. Some handlers also behave as
+hooks that give the program a chance to modify state or adjust settings before
+the connection continues.
+
+Handlers are registered by calling the appropriate `set_*_handler` method on either an
+endpoint or connection. The * refers to the name of the handler (as 
+specified in the signature field below). For example, to set the open handler,
+call `set_open_handler(...)`.
+
+Setting handlers on an endpoint will result in them being copied as the default
+handler to all new connections created by that endpoint. Changing an endpoint's
+handlers will not affect connections that are already in progress. This includes
+connections that are in the listening state. As such, it is important to set any
+endpoint handlers before you call `endpoint::start_accept` or else the handlers
+will not be attached to your first connection.
+
+Setting handlers on a connection will result in the handler being changed for
+that connection only, starting at the next time that handler is called. This can
+be used to change the handler during a connection.
+
+Connection Handlers
+-------------------
+
+These handlers will be called at most once per connection in the order specified below.
+
+### Socket Init Handler
+
+| Event                 | Signature                                             | Availability         |
+| --------------------- | ----------------------------------------------------- | -------------------- |
+| Socket initialization | `socket_init(connection_hdl, asio::ip::tcp::socket&)` | 0.3.0 Asio Transport |
+
+This hook is triggered after the socket has been initialized but before a connection is established. 
+It allows setting arbitrary socket options before connections are sent/recieved.
+
+### TCP Pre-init Handler
+
+| Event                         | Signature                      | Availability         |
+| ----------------------------- | ------------------------------ | -------------------- |
+| TCP established, no data sent | `tcp_pre_init(connection_hdl)` | 0.3.0 Asio Transport |
+
+This hook is triggered after the TCP connection is established, but before any pre-WebSocket-handshake 
+operations have been run. Common pre-handshake operations include TLS handshakes and proxy connections.
+
+### TCP Post-init Handler
+
+| Event                   | Signature                                  | Availability                  |
+| ----------------------- | ------------------------------------------ | ----------------------------- |
+| Request for TLS context | `tls_context_ptr tls_init(connection_hdl)` | 0.3.0 Asio Transport with TLS |
+
+This hook is triggered before the TLS handshake to request the TLS context to use. You must 
+return a pointer to a configured TLS conext to continue. This provides the opportuinity to 
+set up the TLS settings, certificates, etc.
+
+### Validate Handler
+
+| Event                                 | Signature                       | Availability                 |
+| ------------------------------------- | ------------------------------- | ---------------------------- |
+| Hook to accept or reject a connection | `bool validate(connection_hdl)` | 0.3.0 Core, Server role only |
+
+This hook is triggered for servers during the opening handshake after the request has been 
+processed but before the response has been sent. It gives a program the opportunity to inspect
+headers and other connection details and either accept or reject the connection. Validate happens
+before the open or fail handler.
+
+Return true to accept the connection, false to reject. If no validate handler is registered, 
+all connections will be accepted.
+
+### Open Connection Handler
+
+| Event                     | Signature              | Availability |
+| ------------------------- | ---------------------- | ------------ |
+| Successful new connection | `open(connection_hdl)` | 0.3.0 Core   |
+
+Either open or fail will be called for each connection. Never both. All
+connections that begin with an open handler call will also have a matching
+close handler call when the connection ends.
+
+### Fail Connection Handler
+
+| Event                               | Signature              | Availability |
+| ----------------------------------- | ---------------------- | ------------ |
+| Connection failed (before opening)  | `fail(connection_hdl)` | 0.3.0 Core   |
+
+Either open or fail will be called for each connection. Never both. Connections
+that fail will never have a close handler called.
+
+### Close Connection Handler
+
+| Event                             | Signature               | Availability |
+| --------------------------------- | ----------------------- | ------------ |
+| Connection closed (after opening) | `close(connection_hdl)` | 0.3.0 Core   |
+
+Close will be called exactly once for every connection that open was called for.
+Close is not called for failed connections.
+
+Message Handlers
+----------------
+
+These handers are called in response to incoming messages or message like events. They only will be called while the connection is in the open state.
+
+### Message Handler
+
+| Event                 | Signature                              | Availability |
+| --------------------- | -------------------------------------- | ------------ |
+| Data message recieved | `message(connection_hdl, message_ptr)` | 0.3.0 Core   |
+
+Applies to all non-control messages, including both text and binary opcodes. The
+`message_ptr` type and its API depends on your endpoint type and its config.
+
+### Ping Handler
+
+| Event         | Signature                                | Availability |
+| ------------- | ---------------------------------------- | ------------ |
+| Ping recieved | `bool ping(connection_hdl, std::string)` | 0.3.0 Core   |
+
+Second (string) argument is the binary ping payload. Handler return value
+indicates whether or not to respond to the ping with a pong. If no ping handler
+is set, WebSocket++ will respond with a pong containing the same binary data as
+the ping (Per requirements in RFC6455).
+
+### Pong Handler
+
+| Event         | Signature                           | Availability |
+| ------------- | ----------------------------------- | ------------ |
+| Pong recieved | `pong(connection_hdl, std::string)` | 0.3.0 Core   |
+
+Second (string) argument is the binary pong payload.
+
+### Pong Timeout Handler
+
+| Event                              | Signature                                   | Availability                             |
+| ---------------------------------- | ------------------------------------------- | ---------------------------------------- |
+| Timed out while waiting for a pong | `pong_timeout(connection_hdl, std::string)` | 0.3.0 Core, transport with timer support |
+
+Triggered if there is no response to a ping after the configured duration. The second
+(string) argument is the binary payload of the unanswered ping.
+
+### HTTP Handler
+
+| Event                 | Signature             | Availability                 |
+| --------------------- | --------------------- | ---------------------------- |
+| HTTP request recieved | `http(connection_hdl` | 0.3.0 Core, Server role only |
+
+Called when HTTP requests that are not WebSocket handshake upgrade requests are
+recieved. Allows responding to regular HTTP requests. If no handler is registered
+a 426/Upgrade Required error is returned.
+
+### Interrupt Handler
+
+| Event                               | Signature                   | Availability |
+| ----------------------------------- | --------------------------- | ------------ |
+| Connection was manually interrupted | `interrupt(connection_hdl)` | 0.3.0 Core   |
+
+Interrupt events can be triggered by calling `endpoint::interrupt` or `connection::interrupt`. 
+Interrupt is similar to a timer event with duration zero but with lower overhead. It is useful
+for single threaded programs to allow breaking up a very long handler into multiple parts and 
+for multi threaded programs as a way for worker threads to signale to the main/network thread 
+that an event is ready.
+
+todo: write low and high watermark handlers
+
+*/
diff --git a/vendor/websocketpp/docs/manual.css b/vendor/websocketpp/docs/manual.css
new file mode 100644
index 0000000..7c40b18
--- /dev/null
+++ b/vendor/websocketpp/docs/manual.css
@@ -0,0 +1,22 @@
+.tabs, .tabs2, .tabs3, .navpath ul {
+    background-image: none;
+    background-color: #333;
+    border: none;
+    border-bottom: 1px solid #575757;
+}
+
+.tablist li, .navpath li {
+    background-image: none;
+    background-color: #333;
+}
+
+.tablist a, .navpath li.navelem a {
+    color: #ccc;
+    text-shadow: 0px 1px 1px black;
+}
+
+.tablist a:hover, .navpath li.navelem a:hover {
+    background-image: none;
+    background-color: #444;
+    color: #ccc;
+}
diff --git a/vendor/websocketpp/docs/manual.dox b/vendor/websocketpp/docs/manual.dox
new file mode 100644
index 0000000..77e06f9
--- /dev/null
+++ b/vendor/websocketpp/docs/manual.dox
@@ -0,0 +1,21 @@
+/** \mainpage
+
+WebSocket++ is a C++ library that can be used to implement WebSocket functionality. The goals of the project are to provide a WebSocket implementation that is portable, flexible, lightweight, low level, and high performance.
+
+WebSocket++ does not intend to be used alone as a web application framework or full featured web services platform. As such the components, examples, and performance tuning are geared towards operation as a WebSocket client or server. There are some minimal convenience features that stray from this (for example the ability to respond to HTTP requests other than WebSocket Upgrades) but these are not the focus of the project. In particular WebSocket++ does not intend to implement any non-WebSocket related fallback options (ajax / long polling / comet / etc).
+
+In order to remain compact and improve portability, the WebSocket++ project strives to reduce or eliminate external dependencies where possible and appropriate. WebSocket++ core has no dependencies other than the C++11 standard library. For non-C++11 compilers the Boost libraries provide drop in polyfills for the C++11 functionality used.
+
+WebSocket++ implements a pluggable data transport component. The default component allows reduced functionality by using STL iostream or raw byte shuffling via reading and writing char buffers. This component has no non-STL dependencies and can be used in a C++11 environment without Boost. Also included is an Asio based transport component that provides full featured network client/server functionality. This component requires either Boost Asio or a C++11 compiler and standalone Asio. As an advanced option, WebSocket++ supports custom transport layers if you want to provide your own using another library.
+
+In order to accommodate the wide variety of use cases WebSocket++ has collected, the library is built in a way that most of the major components are loosely coupled and can be swapped out and replaced. WebSocket++ will attempt to track the future development of the WebSocket protocol and any extensions as they are developed.
+
+- \subpage getting_started "Getting Started"
+- \subpage faq "FAQ"
+- \subpage tutorials "Tutorials"
+- \subpage md_changelog "Change Log / Version History"
+- Reference
+ - \subpage reference.handlers "Handler Reference"
+
+*/
+
diff --git a/vendor/websocketpp/docs/simple_broadcast_server.cpp b/vendor/websocketpp/docs/simple_broadcast_server.cpp
new file mode 100644
index 0000000..955d711
--- /dev/null
+++ b/vendor/websocketpp/docs/simple_broadcast_server.cpp
@@ -0,0 +1,52 @@
+#include <set>
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+using websocketpp::connection_hdl;
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+class broadcast_server {
+public:
+    broadcast_server() {
+        m_server.init_asio();
+                
+        m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
+        m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
+        m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
+    }
+    
+    void on_open(connection_hdl hdl) {
+        m_connections.insert(hdl);
+    }
+    
+    void on_close(connection_hdl hdl) {
+        m_connections.erase(hdl);
+    }
+    
+    void on_message(connection_hdl hdl, server::message_ptr msg) {
+        for (auto it : m_connections) {
+            m_server.send(it,msg);
+        }
+    }
+
+    void run(uint16_t port) {
+        m_server.listen(port);
+        m_server.start_accept();
+        m_server.run();
+    }
+private:
+    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
+
+    server m_server;
+    con_list m_connections;
+};
+
+int main() {
+    broadcast_server server;
+    server.run(9002);
+}
\ No newline at end of file
diff --git a/vendor/websocketpp/docs/simple_count_server_thread.cpp b/vendor/websocketpp/docs/simple_count_server_thread.cpp
new file mode 100644
index 0000000..a30af99
--- /dev/null
+++ b/vendor/websocketpp/docs/simple_count_server_thread.cpp
@@ -0,0 +1,65 @@
+#include <functional>
+#include <mutex>
+#include <set>
+#include <thread>
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+using websocketpp::connection_hdl;
+
+class count_server {
+public:
+    count_server() : m_count(0) {
+        m_server.init_asio();
+                
+        m_server.set_open_handler(bind(&count_server::on_open,this,_1));
+        m_server.set_close_handler(bind(&count_server::on_close,this,_1));
+    }
+    
+    void on_open(connection_hdl hdl) {
+        std::lock_guard<std::mutex> lock(m_mutex);
+        m_connections.insert(hdl);
+    }
+    
+    void on_close(connection_hdl hdl) {
+        std::lock_guard<std::mutex> lock(m_mutex);
+        m_connections.erase(hdl);
+    }
+    
+    void count() {
+        while (1) {
+            sleep(1);
+            m_count++;
+            
+            std::stringstream ss;
+            ss << m_count;
+            
+            std::lock_guard<std::mutex> lock(m_mutex);    
+            for (auto it : m_connections) {
+                m_server.send(it,ss.str(),websocketpp::frame::opcode::text);
+            }
+        }
+    }
+    
+    void run(uint16_t port) {
+        m_server.listen(port);
+        m_server.start_accept();
+        m_server.run();
+    }
+private:
+    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
+    
+    int m_count;
+    server m_server;
+    con_list m_connections;
+    std::mutex m_mutex;
+};
+
+int main() {
+    count_server server;
+    std::thread t(std::bind(&count_server::count,&server));
+    server.run(9002);
+}
\ No newline at end of file
diff --git a/vendor/websocketpp/docs/tutorials.dox b/vendor/websocketpp/docs/tutorials.dox
new file mode 100644
index 0000000..8751e97
--- /dev/null
+++ b/vendor/websocketpp/docs/tutorials.dox
@@ -0,0 +1,10 @@
+/** \page tutorials Tutorials
+
+These tutorials are works in progress, some are more complete than others.
+
+- \subpage md_tutorials_utility_client_utility_client
+- \subpage md_tutorials_utility_server_utility_server
+- \subpage md_tutorials_broadcast_tutorial_broadcast_tutorial
+- \subpage md_tutorials_chat_tutorial_chat_tutorial
+
+*/
diff --git a/vendor/websocketpp/examples/associative_storage/CMakeLists.txt b/vendor/websocketpp/examples/associative_storage/CMakeLists.txt
new file mode 100644
index 0000000..2f77e7b
--- /dev/null
+++ b/vendor/websocketpp/examples/associative_storage/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (associative_storage)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/associative_storage/associative_storage.cpp b/vendor/websocketpp/examples/associative_storage/associative_storage.cpp
new file mode 100644
index 0000000..2ac8494
--- /dev/null
+++ b/vendor/websocketpp/examples/associative_storage/associative_storage.cpp
@@ -0,0 +1,88 @@
+#include <iostream>
+#include <map>
+#include <exception>
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+using websocketpp::connection_hdl;
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+struct connection_data {
+    int sessionid;
+    std::string name;
+};
+
+class print_server {
+public:
+    print_server() : m_next_sessionid(1) {
+        m_server.init_asio();
+
+        m_server.set_open_handler(bind(&print_server::on_open,this,::_1));
+        m_server.set_close_handler(bind(&print_server::on_close,this,::_1));
+        m_server.set_message_handler(bind(&print_server::on_message,this,::_1,::_2));
+    }
+
+    void on_open(connection_hdl hdl) {
+        connection_data data;
+
+        data.sessionid = m_next_sessionid++;
+        data.name.clear();
+
+        m_connections[hdl] = data;
+    }
+
+    void on_close(connection_hdl hdl) {
+        connection_data& data = get_data_from_hdl(hdl);
+
+        std::cout << "Closing connection " << data.name
+                  << " with sessionid " << data.sessionid << std::endl;
+
+        m_connections.erase(hdl);
+    }
+
+    void on_message(connection_hdl hdl, server::message_ptr msg) {
+        connection_data& data = get_data_from_hdl(hdl);
+
+        if (data.name.empty()) {
+            data.name = msg->get_payload();
+            std::cout << "Setting name of connection with sessionid "
+                      << data.sessionid << " to " << data.name << std::endl;
+        } else {
+            std::cout << "Got a message from connection " << data.name
+                      << " with sessionid " << data.sessionid << std::endl;
+        }
+    }
+
+    connection_data& get_data_from_hdl(connection_hdl hdl) {
+        auto it = m_connections.find(hdl);
+
+        if (it == m_connections.end()) {
+            // this connection is not in the list. This really shouldn't happen
+            // and probably means something else is wrong.
+            throw std::invalid_argument("No data available for session");
+        }
+
+        return it->second;
+    }
+
+    void run(uint16_t port) {
+        m_server.listen(port);
+        m_server.start_accept();
+        m_server.run();
+    }
+private:
+    typedef std::map<connection_hdl,connection_data,std::owner_less<connection_hdl>> con_list;
+
+    int m_next_sessionid;
+    server m_server;
+    con_list m_connections;
+};
+
+int main() {
+    print_server server;
+    server.run(9002);
+}
diff --git a/vendor/websocketpp/examples/broadcast_server/CMakeLists.txt b/vendor/websocketpp/examples/broadcast_server/CMakeLists.txt
new file mode 100644
index 0000000..5fb5fe3
--- /dev/null
+++ b/vendor/websocketpp/examples/broadcast_server/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (broadcast_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/broadcast_server/SConscript b/vendor/websocketpp/examples/broadcast_server/SConscript
new file mode 100644
index 0000000..5786f57
--- /dev/null
+++ b/vendor/websocketpp/examples/broadcast_server/SConscript
@@ -0,0 +1,23 @@
+## Broadcast Server example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','thread'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('broadcast_server', ["broadcast_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/broadcast_server/broadcast_server.cpp b/vendor/websocketpp/examples/broadcast_server/broadcast_server.cpp
new file mode 100644
index 0000000..b02e7cd
--- /dev/null
+++ b/vendor/websocketpp/examples/broadcast_server/broadcast_server.cpp
@@ -0,0 +1,160 @@
+#include <websocketpp/config/asio_no_tls.hpp>
+
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+#include <set>
+
+/*#include <boost/thread.hpp>
+#include <boost/thread/mutex.hpp>
+#include <boost/thread/condition_variable.hpp>*/
+#include <websocketpp/common/thread.hpp>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+using websocketpp::connection_hdl;
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+using websocketpp::lib::thread;
+using websocketpp::lib::mutex;
+using websocketpp::lib::lock_guard;
+using websocketpp::lib::unique_lock;
+using websocketpp::lib::condition_variable;
+
+/* on_open insert connection_hdl into channel
+ * on_close remove connection_hdl from channel
+ * on_message queue send to all channels
+ */
+
+enum action_type {
+    SUBSCRIBE,
+    UNSUBSCRIBE,
+    MESSAGE
+};
+
+struct action {
+    action(action_type t, connection_hdl h) : type(t), hdl(h) {}
+    action(action_type t, connection_hdl h, server::message_ptr m)
+      : type(t), hdl(h), msg(m) {}
+
+    action_type type;
+    websocketpp::connection_hdl hdl;
+    server::message_ptr msg;
+};
+
+class broadcast_server {
+public:
+    broadcast_server() {
+        // Initialize Asio Transport
+        m_server.init_asio();
+
+        // Register handler callbacks
+        m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
+        m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
+        m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
+    }
+
+    void run(uint16_t port) {
+        // listen on specified port
+        m_server.listen(port);
+
+        // Start the server accept loop
+        m_server.start_accept();
+
+        // Start the ASIO io_service run loop
+        try {
+            m_server.run();
+        } catch (const std::exception & e) {
+            std::cout << e.what() << std::endl;
+        }
+    }
+
+    void on_open(connection_hdl hdl) {
+        {
+            lock_guard<mutex> guard(m_action_lock);
+            //std::cout << "on_open" << std::endl;
+            m_actions.push(action(SUBSCRIBE,hdl));
+        }
+        m_action_cond.notify_one();
+    }
+
+    void on_close(connection_hdl hdl) {
+        {
+            lock_guard<mutex> guard(m_action_lock);
+            //std::cout << "on_close" << std::endl;
+            m_actions.push(action(UNSUBSCRIBE,hdl));
+        }
+        m_action_cond.notify_one();
+    }
+
+    void on_message(connection_hdl hdl, server::message_ptr msg) {
+        // queue message up for sending by processing thread
+        {
+            lock_guard<mutex> guard(m_action_lock);
+            //std::cout << "on_message" << std::endl;
+            m_actions.push(action(MESSAGE,hdl,msg));
+        }
+        m_action_cond.notify_one();
+    }
+
+    void process_messages() {
+        while(1) {
+            unique_lock<mutex> lock(m_action_lock);
+
+            while(m_actions.empty()) {
+                m_action_cond.wait(lock);
+            }
+
+            action a = m_actions.front();
+            m_actions.pop();
+
+            lock.unlock();
+
+            if (a.type == SUBSCRIBE) {
+                lock_guard<mutex> guard(m_connection_lock);
+                m_connections.insert(a.hdl);
+            } else if (a.type == UNSUBSCRIBE) {
+                lock_guard<mutex> guard(m_connection_lock);
+                m_connections.erase(a.hdl);
+            } else if (a.type == MESSAGE) {
+                lock_guard<mutex> guard(m_connection_lock);
+
+                con_list::iterator it;
+                for (it = m_connections.begin(); it != m_connections.end(); ++it) {
+                    m_server.send(*it,a.msg);
+                }
+            } else {
+                // undefined.
+            }
+        }
+    }
+private:
+    typedef std::set<connection_hdl,std::owner_less<connection_hdl> > con_list;
+
+    server m_server;
+    con_list m_connections;
+    std::queue<action> m_actions;
+
+    mutex m_action_lock;
+    mutex m_connection_lock;
+    condition_variable m_action_cond;
+};
+
+int main() {
+    try {
+    broadcast_server server_instance;
+
+    // Start a thread to run the processing loop
+    thread t(bind(&broadcast_server::process_messages,&server_instance));
+
+    // Run the asio loop with the main thread
+    server_instance.run(9002);
+
+    t.join();
+
+    } catch (websocketpp::exception const & e) {
+        std::cout << e.what() << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/debug_client/CMakeLists.txt b/vendor/websocketpp/examples/debug_client/CMakeLists.txt
new file mode 100644
index 0000000..651208a
--- /dev/null
+++ b/vendor/websocketpp/examples/debug_client/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+if (OPENSSL_FOUND)
+
+init_target (debug_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+link_openssl()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
+
+endif()
\ No newline at end of file
diff --git a/vendor/websocketpp/examples/debug_client/SConscript b/vendor/websocketpp/examples/debug_client/SConscript
new file mode 100644
index 0000000..781db83
--- /dev/null
+++ b/vendor/websocketpp/examples/debug_client/SConscript
@@ -0,0 +1,24 @@
+## Debug client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/debug_client/debug_client.cpp b/vendor/websocketpp/examples/debug_client/debug_client.cpp
new file mode 100644
index 0000000..5f4a1b7
--- /dev/null
+++ b/vendor/websocketpp/examples/debug_client/debug_client.cpp
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** ====== WARNING ========
+ * This example is presently used as a scratch space. It may or may not be broken
+ * at any given time.
+ */
+
+#include <websocketpp/config/asio_client.hpp>
+
+#include <websocketpp/client.hpp>
+
+#include <iostream>
+#include <chrono>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr;
+typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
+typedef client::connection_ptr connection_ptr;
+
+
+
+class perftest {
+public:
+    typedef perftest type;
+    typedef std::chrono::duration<int,std::micro> dur_type;
+
+    perftest () {
+        m_endpoint.set_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
+
+        // Initialize ASIO
+        m_endpoint.init_asio();
+
+        // Register our handlers
+        m_endpoint.set_socket_init_handler(bind(&type::on_socket_init,this,::_1));
+        //m_endpoint.set_tls_init_handler(bind(&type::on_tls_init,this,::_1));
+        m_endpoint.set_message_handler(bind(&type::on_message,this,::_1,::_2));
+        m_endpoint.set_open_handler(bind(&type::on_open,this,::_1));
+        m_endpoint.set_close_handler(bind(&type::on_close,this,::_1));
+        m_endpoint.set_fail_handler(bind(&type::on_fail,this,::_1));
+    }
+
+    void start(std::string uri) {
+        websocketpp::lib::error_code ec;
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
+            return;
+        }
+
+        //con->set_proxy("http://humupdates.uchicago.edu:8443");
+
+        m_endpoint.connect(con);
+
+        // Start the ASIO io_service run loop
+        m_start = std::chrono::high_resolution_clock::now();
+        m_endpoint.run();
+    }
+
+    void on_socket_init(websocketpp::connection_hdl) {
+        m_socket_init = std::chrono::high_resolution_clock::now();
+    }
+
+    context_ptr on_tls_init(websocketpp::connection_hdl) {
+        m_tls_init = std::chrono::high_resolution_clock::now();
+        context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
+
+        try {
+            ctx->set_options(boost::asio::ssl::context::default_workarounds |
+                             boost::asio::ssl::context::no_sslv2 |
+                             boost::asio::ssl::context::no_sslv3 |
+                             boost::asio::ssl::context::single_dh_use);
+        } catch (std::exception& e) {
+            std::cout << e.what() << std::endl;
+        }
+        return ctx;
+    }
+
+    void on_fail(websocketpp::connection_hdl hdl) {
+        client::connection_ptr con = m_endpoint.get_con_from_hdl(hdl);
+        
+        std::cout << "Fail handler" << std::endl;
+        std::cout << con->get_state() << std::endl;
+        std::cout << con->get_local_close_code() << std::endl;
+        std::cout << con->get_local_close_reason() << std::endl;
+        std::cout << con->get_remote_close_code() << std::endl;
+        std::cout << con->get_remote_close_reason() << std::endl;
+        std::cout << con->get_ec() << " - " << con->get_ec().message() << std::endl;
+    }
+
+    void on_open(websocketpp::connection_hdl hdl) {
+        m_open = std::chrono::high_resolution_clock::now();
+        m_endpoint.send(hdl, "", websocketpp::frame::opcode::text);
+    }
+    void on_message(websocketpp::connection_hdl hdl, message_ptr) {
+        m_message = std::chrono::high_resolution_clock::now();
+        m_endpoint.close(hdl,websocketpp::close::status::going_away,"");
+    }
+    void on_close(websocketpp::connection_hdl) {
+        m_close = std::chrono::high_resolution_clock::now();
+
+        std::cout << "Socket Init: " << std::chrono::duration_cast<dur_type>(m_socket_init-m_start).count() << std::endl;
+        std::cout << "TLS Init: " << std::chrono::duration_cast<dur_type>(m_tls_init-m_start).count() << std::endl;
+        std::cout << "Open: " << std::chrono::duration_cast<dur_type>(m_open-m_start).count() << std::endl;
+        std::cout << "Message: " << std::chrono::duration_cast<dur_type>(m_message-m_start).count() << std::endl;
+        std::cout << "Close: " << std::chrono::duration_cast<dur_type>(m_close-m_start).count() << std::endl;
+    }
+private:
+    client m_endpoint;
+
+    std::chrono::high_resolution_clock::time_point m_start;
+    std::chrono::high_resolution_clock::time_point m_socket_init;
+    std::chrono::high_resolution_clock::time_point m_tls_init;
+    std::chrono::high_resolution_clock::time_point m_open;
+    std::chrono::high_resolution_clock::time_point m_message;
+    std::chrono::high_resolution_clock::time_point m_close;
+};
+
+int main(int argc, char* argv[]) {
+    std::string uri = "wss://echo.websocket.org";
+
+    if (argc == 2) {
+        uri = argv[1];
+    }
+
+    try {
+        perftest endpoint;
+        endpoint.start(uri);
+    } catch (const std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (websocketpp::lib::error_code e) {
+        std::cout << e.message() << std::endl;
+    } catch (...) {
+        std::cout << "other exception" << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/debug_server/CMakeLists.txt b/vendor/websocketpp/examples/debug_server/CMakeLists.txt
new file mode 100644
index 0000000..d134d31
--- /dev/null
+++ b/vendor/websocketpp/examples/debug_server/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (debug_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/debug_server/SConscript b/vendor/websocketpp/examples/debug_server/SConscript
new file mode 100644
index 0000000..4d02261
--- /dev/null
+++ b/vendor/websocketpp/examples/debug_server/SConscript
@@ -0,0 +1,23 @@
+## Debug server example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/debug_server/debug_server.cpp b/vendor/websocketpp/examples/debug_server/debug_server.cpp
new file mode 100644
index 0000000..111a394
--- /dev/null
+++ b/vendor/websocketpp/examples/debug_server/debug_server.cpp
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/** ====== WARNING ========
+ * This example is presently used as a scratch space. It may or may not be broken
+ * at any given time.
+ */
+
+#include <websocketpp/config/debug_asio_no_tls.hpp>
+
+// Custom logger
+#include <websocketpp/logger/syslog.hpp>
+
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+
+////////////////////////////////////////////////////////////////////////////////
+///////////////// Custom Config for debugging custom policies //////////////////
+////////////////////////////////////////////////////////////////////////////////
+
+struct debug_custom : public websocketpp::config::debug_asio {
+    typedef debug_custom type;
+    typedef debug_asio base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    /// Custom Logging policies
+    /*typedef websocketpp::log::syslog<concurrency_type,
+        websocketpp::log::elevel> elog_type;
+    typedef websocketpp::log::syslog<concurrency_type,
+        websocketpp::log::alevel> alog_type;
+    */
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+    
+    static const long timeout_open_handshake = 0;
+};
+
+////////////////////////////////////////////////////////////////////////////////
+
+typedef websocketpp::server<debug_custom> server;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef server::message_ptr message_ptr;
+
+bool validate(server *, websocketpp::connection_hdl) {
+    //sleep(6);
+    return true;
+}
+
+void on_http(server* s, websocketpp::connection_hdl hdl) {
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+
+    std::string res = con->get_request_body();
+
+    std::stringstream ss;
+    ss << "got HTTP request with " << res.size() << " bytes of body data.";
+
+    con->set_body(ss.str());
+    con->set_status(websocketpp::http::status_code::ok);
+}
+
+void on_fail(server* s, websocketpp::connection_hdl hdl) {
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+    
+    std::cout << "Fail handler: " << con->get_ec() << " " << con->get_ec().message()  << std::endl;
+}
+
+void on_close(websocketpp::connection_hdl) {
+    std::cout << "Close handler" << std::endl;
+}
+
+// Define a callback to handle incoming messages
+void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
+              << " and message: " << msg->get_payload()
+              << std::endl;
+
+    try {
+        s->send(hdl, msg->get_payload(), msg->get_opcode());
+    } catch (const websocketpp::lib::error_code& e) {
+        std::cout << "Echo failed because: " << e
+                  << "(" << e.message() << ")" << std::endl;
+    }
+}
+
+int main() {
+    // Create a server endpoint
+    server echo_server;
+
+    try {
+        // Set logging settings
+        echo_server.set_access_channels(websocketpp::log::alevel::all);
+        echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
+
+        // Initialize ASIO
+        echo_server.init_asio();
+        echo_server.set_reuse_addr(true);
+
+        // Register our message handler
+        echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
+
+        echo_server.set_http_handler(bind(&on_http,&echo_server,::_1));
+        echo_server.set_fail_handler(bind(&on_fail,&echo_server,::_1));
+        echo_server.set_close_handler(&on_close);
+
+        echo_server.set_validate_handler(bind(&validate,&echo_server,::_1));
+
+        // Listen on port 9012
+        echo_server.listen(9012);
+
+        // Start the server accept loop
+        echo_server.start_accept();
+
+        // Start the ASIO io_service run loop
+        echo_server.run();
+    } catch (const std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (websocketpp::lib::error_code e) {
+        std::cout << e.message() << std::endl;
+    } catch (...) {
+        std::cout << "other exception" << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/dev/CMakeLists.txt b/vendor/websocketpp/examples/dev/CMakeLists.txt
new file mode 100644
index 0000000..f820c6b
--- /dev/null
+++ b/vendor/websocketpp/examples/dev/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+#init_target (dev)
+
+#build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+#link_boost ()
+#final_target ()
+
+#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/dev/SConscript b/vendor/websocketpp/examples/dev/SConscript
new file mode 100644
index 0000000..34ddac2
--- /dev/null
+++ b/vendor/websocketpp/examples/dev/SConscript
@@ -0,0 +1,18 @@
+## Main development example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system','timer','chrono'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('main', ["main.cpp"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/dev/main.cpp b/vendor/websocketpp/examples/dev/main.cpp
new file mode 100644
index 0000000..3b7bdfb
--- /dev/null
+++ b/vendor/websocketpp/examples/dev/main.cpp
@@ -0,0 +1,200 @@
+//#ifndef _WEBSOCKETPP_CPP11_STL_
+//    #define _WEBSOCKETPP_CPP11_STL_
+//#endif
+
+#include <random>
+#include <boost/timer/timer.hpp>
+
+#include <websocketpp/config/core.hpp>
+
+//#include <websocketpp/security/none.hpp>
+
+//#include <websocketpp/concurrency/none.hpp>
+//#include <websocketpp/concurrency/stl.hpp>
+
+//#include <websocketpp/transport/iostream.hpp>
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+#include <sstream>
+
+//typedef websocketpp::concurrency::stl concurrency;
+//typedef websocketpp::transport::iostream<concurrency> transport;
+//typedef websocketpp::server<concurrency,transport> server;
+typedef websocketpp::server<websocketpp::config::core> server;
+
+/*class handler : public server::handler {
+    bool validate(connection_ptr con) {
+        std::cout << "handler validate" << std::endl;
+        if (con->get_origin() != "http://www.example.com") {
+            con->set_status(websocketpp::http::status_code::FORBIDDEN);
+            return false;
+        }
+        return true;
+    }
+
+    void http(connection_ptr con) {
+        std::cout << "handler http" << std::endl;
+    }
+
+    void on_load(connection_ptr con, ptr old_handler) {
+        std::cout << "handler on_load" << std::endl;
+    }
+    void on_unload(connection_ptr con, ptr new_handler) {
+        std::cout << "handler on_unload" << std::endl;
+    }
+
+    void on_open(connection_ptr con) {
+        std::cout << "handler on_open" << std::endl;
+    }
+    void on_fail(connection_ptr con) {
+        std::cout << "handler on_fail" << std::endl;
+    }
+
+    void on_message(connection_ptr con, message_ptr msg) {
+        std::cout << "handler on_message" << std::endl;
+
+
+    }
+
+    void on_close(connection_ptr con) {
+        std::cout << "handler on_close" << std::endl;
+    }
+};*/
+
+int main() {
+    typedef websocketpp::message_buffer::message<websocketpp::message_buffer::alloc::con_msg_manager>
+        message_type;
+    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_man_type;
+
+    con_msg_man_type::ptr manager = websocketpp::lib::make_shared<con_msg_man_type>();
+
+    size_t foo = 1024;
+
+    message_type::ptr input = manager->get_message(websocketpp::frame::opcode::TEXT,foo);
+    message_type::ptr output = manager->get_message(websocketpp::frame::opcode::TEXT,foo);
+    websocketpp::frame::masking_key_type key;
+
+    std::random_device dev;
+
+
+
+    key.i = 0x12345678;
+
+    double m = 18094238402394.0824923;
+
+    /*std::cout << "Some Math" << std::endl;
+    {
+        boost::timer::auto_cpu_timer t;
+
+        for (int i = 0; i < foo; i++) {
+            m /= 1.001;
+        }
+
+    }*/
+
+    std::cout << m << std::endl;
+
+    std::cout << "Random Gen" << std::endl;
+    {
+        boost::timer::auto_cpu_timer t;
+
+        input->get_raw_payload().replace(0,foo,foo,'\0');
+        output->get_raw_payload().replace(0,foo,foo,'\0');
+    }
+
+    std::cout << "Out of place accelerated" << std::endl;
+    {
+        boost::timer::auto_cpu_timer t;
+
+        websocketpp::frame::word_mask_exact(reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), reinterpret_cast<uint8_t*>(const_cast<char*>(output->get_raw_payload().data())), foo, key);
+    }
+
+    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
+    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
+
+    input->get_raw_payload().replace(0,foo,foo,'\0');
+    output->get_raw_payload().replace(0,foo,foo,'\0');
+
+    std::cout << "In place accelerated" << std::endl;
+    {
+        boost::timer::auto_cpu_timer t;
+
+        websocketpp::frame::word_mask_exact(reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), reinterpret_cast<uint8_t*>(const_cast<char*>(input->get_raw_payload().data())), foo, key);
+    }
+
+    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
+    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
+
+    input->get_raw_payload().replace(0,foo,foo,'\0');
+    output->get_raw_payload().replace(0,foo,foo,'\0');
+    std::cout << "Out of place byte by byte" << std::endl;
+    {
+        boost::timer::auto_cpu_timer t;
+
+        websocketpp::frame::byte_mask(input->get_raw_payload().begin(), input->get_raw_payload().end(), output->get_raw_payload().begin(), key);
+    }
+
+    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
+    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
+
+    input->get_raw_payload().replace(0,foo,foo,'\0');
+    output->get_raw_payload().replace(0,foo,foo,'\0');
+    std::cout << "In place byte by byte" << std::endl;
+    {
+        boost::timer::auto_cpu_timer t;
+
+        websocketpp::frame::byte_mask(input->get_raw_payload().begin(), input->get_raw_payload().end(), input->get_raw_payload().begin(), key);
+    }
+
+    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
+    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
+
+    input->get_raw_payload().replace(0,foo,foo,'a');
+    output->get_raw_payload().replace(0,foo,foo,'b');
+    std::cout << "Copy" << std::endl;
+    {
+        boost::timer::auto_cpu_timer t;
+
+        std::copy(input->get_raw_payload().begin(), input->get_raw_payload().end(), output->get_raw_payload().begin());
+    }
+
+    std::cout << websocketpp::utility::to_hex(input->get_payload().c_str(),20) << std::endl;
+    std::cout << websocketpp::utility::to_hex(output->get_payload().c_str(),20) << std::endl;
+
+    /*server::handler::ptr h(new handler());
+
+    server test_server(h);
+    server::connection_ptr con;
+
+    std::stringstream output;
+
+    test_server.register_ostream(&output);
+
+    con = test_server.get_connection();
+
+    con->start();
+
+    //foo.handle_accept(con,true);
+
+    std::stringstream input;
+    input << "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+    //input << "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
+    input >> *con;
+
+    std::stringstream input2;
+    input2 << "messageabc2";
+    input2 >> *con;
+
+    std::stringstream input3;
+    input3 << "messageabc3";
+    input3 >> *con;
+
+    std::stringstream input4;
+    input4 << "close";
+    input4 >> *con;
+
+    std::cout << "connection output:" << std::endl;
+    std::cout << output.str() << std::endl;*/
+}
diff --git a/vendor/websocketpp/examples/echo_client/CMakeLists.txt b/vendor/websocketpp/examples/echo_client/CMakeLists.txt
new file mode 100644
index 0000000..1fdf39e
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_client/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (echo_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/echo_client/SConscript b/vendor/websocketpp/examples/echo_client/SConscript
new file mode 100644
index 0000000..0e41108
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_client/SConscript
@@ -0,0 +1,23 @@
+## echo_client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
+   prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + ['z']
+   prgs += env.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/echo_client/echo_client.cpp b/vendor/websocketpp/examples/echo_client/echo_client.cpp
new file mode 100644
index 0000000..59af661
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_client/echo_client.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <iostream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef websocketpp::config::asio_client::message_type::ptr message_ptr;
+
+// This message handler will be invoked once for each incoming message. It
+// prints the message and then sends a copy of the message back to the server.
+void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
+              << " and message: " << msg->get_payload()
+              << std::endl;
+
+
+    websocketpp::lib::error_code ec;
+
+    c->send(hdl, msg->get_payload(), msg->get_opcode(), ec);
+    if (ec) {
+        std::cout << "Echo failed because: " << ec.message() << std::endl;
+    }
+}
+
+int main(int argc, char* argv[]) {
+    // Create a client endpoint
+    client c;
+
+    std::string uri = "ws://localhost:9002";
+
+    if (argc == 2) {
+        uri = argv[1];
+    }
+
+    try {
+        // Set logging to be pretty verbose (everything except message payloads)
+        c.set_access_channels(websocketpp::log::alevel::all);
+        c.clear_access_channels(websocketpp::log::alevel::frame_payload);
+
+        // Initialize ASIO
+        c.init_asio();
+
+        // Register our message handler
+        c.set_message_handler(bind(&on_message,&c,::_1,::_2));
+
+        websocketpp::lib::error_code ec;
+        client::connection_ptr con = c.get_connection(uri, ec);
+        if (ec) {
+            std::cout << "could not create connection because: " << ec.message() << std::endl;
+            return 0;
+        }
+
+        // Note that connect here only requests a connection. No network messages are
+        // exchanged until the event loop starts running in the next line.
+        c.connect(con);
+
+        // Start the ASIO io_service run loop
+        // this will cause a single connection to be made to the server. c.run()
+        // will exit when this connection is closed.
+        c.run();
+    } catch (websocketpp::exception const & e) {
+        std::cout << e.what() << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/echo_server/CMakeLists.txt b/vendor/websocketpp/examples/echo_server/CMakeLists.txt
new file mode 100644
index 0000000..a48be52
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (echo_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/echo_server/SConscript b/vendor/websocketpp/examples/echo_server/SConscript
new file mode 100644
index 0000000..a297885
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server/SConscript
@@ -0,0 +1,23 @@
+## Main development example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('echo_server', ["echo_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/echo_server/echo_handler.hpp b/vendor/websocketpp/examples/echo_server/echo_handler.hpp
new file mode 100644
index 0000000..f55b867
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server/echo_handler.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2012, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
+#define WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
+
+class echo_handler : public server::handler {
+    void on_message(connection_ptr con, std::string msg) {
+        con->write(msg);
+    }
+};
+
+#endif // WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
diff --git a/vendor/websocketpp/examples/echo_server/echo_server.cpp b/vendor/websocketpp/examples/echo_server/echo_server.cpp
new file mode 100644
index 0000000..166040f
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server/echo_server.cpp
@@ -0,0 +1,65 @@
+#include <websocketpp/config/asio_no_tls.hpp>
+
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef server::message_ptr message_ptr;
+
+// Define a callback to handle incoming messages
+void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
+              << " and message: " << msg->get_payload()
+              << std::endl;
+
+    // check for a special command to instruct the server to stop listening so
+    // it can be cleanly exited.
+    if (msg->get_payload() == "stop-listening") {
+        s->stop_listening();
+        return;
+    }
+
+    try {
+        s->send(hdl, msg->get_payload(), msg->get_opcode());
+    } catch (const websocketpp::lib::error_code& e) {
+        std::cout << "Echo failed because: " << e
+                  << "(" << e.message() << ")" << std::endl;
+    }
+}
+
+int main() {
+    // Create a server endpoint
+    server echo_server;
+
+    try {
+        // Set logging settings
+        echo_server.set_access_channels(websocketpp::log::alevel::all);
+        echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
+
+        // Initialize Asio
+        echo_server.init_asio();
+
+        // Register our message handler
+        echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
+
+        // Listen on port 9002
+        echo_server.listen(9002);
+
+        // Start the server accept loop
+        echo_server.start_accept();
+
+        // Start the ASIO io_service run loop
+        echo_server.run();
+    } catch (websocketpp::exception const & e) {
+        std::cout << e.what() << std::endl;
+    } catch (...) {
+        std::cout << "other exception" << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/echo_server_both/CMakeLists.txt b/vendor/websocketpp/examples/echo_server_both/CMakeLists.txt
new file mode 100644
index 0000000..83c50dc
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_both/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+
+if (OPENSSL_FOUND)
+
+init_target (echo_server_both)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+link_openssl()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
+
+endif()
diff --git a/vendor/websocketpp/examples/echo_server_both/SConscript b/vendor/websocketpp/examples/echo_server_both/SConscript
new file mode 100644
index 0000000..d1ecf20
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_both/SConscript
@@ -0,0 +1,24 @@
+## Combo plain+tls echo server
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env_cpp11.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env.Program('echo_server_both', ["echo_server_both.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/echo_server_both/echo_server_both.cpp b/vendor/websocketpp/examples/echo_server_both/echo_server_both.cpp
new file mode 100644
index 0000000..b277d5c
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_both/echo_server_both.cpp
@@ -0,0 +1,87 @@
+#include <websocketpp/config/asio.hpp>
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+
+// define types for two different server endpoints, one for each config we are
+// using
+typedef websocketpp::server<websocketpp::config::asio> server_plain;
+typedef websocketpp::server<websocketpp::config::asio_tls> server_tls;
+
+// alias some of the bind related functions as they are a bit long
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// type of the ssl context pointer is long so alias it
+typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
+
+// The shared on_message handler takes a template parameter so the function can
+// resolve any endpoint dependent types like message_ptr or connection_ptr
+template <typename EndpointType>
+void on_message(EndpointType* s, websocketpp::connection_hdl hdl,
+    typename EndpointType::message_ptr msg)
+{
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
+              << " and message: " << msg->get_payload()
+              << std::endl;
+
+    try {
+        s->send(hdl, msg->get_payload(), msg->get_opcode());
+    } catch (const websocketpp::lib::error_code& e) {
+        std::cout << "Echo failed because: " << e
+                  << "(" << e.message() << ")" << std::endl;
+    }
+}
+
+// No change to TLS init methods from echo_server_tls
+std::string get_password() {
+    return "test";
+}
+
+context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
+    std::cout << "on_tls_init called with hdl: " << hdl.lock().get() << std::endl;
+    context_ptr ctx(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
+
+    try {
+        ctx->set_options(boost::asio::ssl::context::default_workarounds |
+                         boost::asio::ssl::context::no_sslv2 |
+                         boost::asio::ssl::context::no_sslv3 |
+                         boost::asio::ssl::context::single_dh_use);
+        ctx->set_password_callback(bind(&get_password));
+        ctx->use_certificate_chain_file("server.pem");
+        ctx->use_private_key_file("server.pem", boost::asio::ssl::context::pem);
+    } catch (std::exception& e) {
+        std::cout << e.what() << std::endl;
+    }
+    return ctx;
+}
+
+int main() {
+    // set up an external io_service to run both endpoints on. This is not
+    // strictly necessary, but simplifies thread management a bit.
+    boost::asio::io_service ios;
+
+    // set up plain endpoint
+    server_plain endpoint_plain;
+    // initialize asio with our external io_service rather than an internal one
+    endpoint_plain.init_asio(&ios);
+    endpoint_plain.set_message_handler(
+        bind(&on_message<server_plain>,&endpoint_plain,::_1,::_2));
+    endpoint_plain.listen(80);
+    endpoint_plain.start_accept();
+
+    // set up tls endpoint
+    server_tls endpoint_tls;
+    endpoint_tls.init_asio(&ios);
+    endpoint_tls.set_message_handler(
+        bind(&on_message<server_tls>,&endpoint_tls,::_1,::_2));
+    // TLS endpoint has an extra handler for the tls init
+    endpoint_tls.set_tls_init_handler(bind(&on_tls_init,::_1));
+    // tls endpoint listens on a different port
+    endpoint_tls.listen(443);
+    endpoint_tls.start_accept();
+
+    // Start the ASIO io_service run loop running both endpoints
+    ios.run();
+}
diff --git a/vendor/websocketpp/examples/echo_server_both/server.pem b/vendor/websocketpp/examples/echo_server_both/server.pem
new file mode 100644
index 0000000..9f679a4
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_both/server.pem
@@ -0,0 +1,58 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,A0ED66EF872A48A9
+
+gXuvKojXzApVhhPVNdRliiajbC4PtwQG5c8TA7JADLgwOR7o9t6KtXEr37bDRpvB
+9aO9P+SJaK5OOp3XKPGthOdqv+tvCRTlmzmC8GjPLBX389DWT2xoGu7JkGwDtdSm
+rnF49Rlp5bfjpACk5xKNiKeDo1CWfeEJzw9Kto0g+5eMaEdors64oPzjXs3geA2g
+TxCJSHv9qSX6++pCLKKCUTbyzidAxV/Zb0AAubt5V40QKqX4HhSwwstFnTaX3tlb
+3QOdY+y04VIkM6d7qN5W8M7NzRkMpZ1qBpQcUMpkhQcRzWP2wub5AAff9D2GntRd
+4Dz1vn3u41U3Okdr0CNj+iH7byCzuokoAhk6ZQEN6WB+GTpGgfBXdtUZrfpb0MKm
+UNYP5AF2AmUqJRXhViTDVtu/V2tHF3LGuNT+W2Dz+spFZEq0byEO0N858eR0dikc
+6jOASvNQbSwD0+mkgBC1gXKKU3ngj2gpJUwljeACdWFd8N2egrZfyI05CmX7vPNC
+NXbs7k2buWNdjP4/D8IM+HDVidWzQa/kG/qokXKqllem9Egg37lUucwnP3cX2/Hw
+U2mfaBWzeZtqc+GqRp08rYIql+Reai3sUYlQMnNk01prVY47UQb+dxuqjaxGV5Xx
+Xkx0s2mfQnNRjL4S7Hjhqelufi6GpkCQ2EGsPpA+6K1ztZ0ame9Q2BE1SXeM/6vU
+rxT5nRrCxueyXAyQSGcqMX9//gSeK8WWBqG/c1IAMVDa0NWrJeOJhSziE+ta3B0m
+bHAPBY6vh0iB3lLdRlbUOPbC6R1TpxMOs+6Vbs2+OTifFpvOVymEoZq/nroyg68P
+vn5uCKogwWA7o8EArf/UTlIwWJmH9bgILdZKld4wMel2HQg16RDzm+mEXAJi52a/
+FC+fgfphdxltmUJ+rqOyR4AHULjaTWUQqTIB6sdlzgmES1nXAiE71zX//KFqomar
+O60SPPk3C1bs0x5DsvmGJa8SIfDhyd+D7NPyqwEKqrZsaotYGklNkfqxa6pa8mrc
+ejxquW1PK4FvBk26+osu5a90Jih0PcQM7DUMMr2WHdTiMSXWAiK2ToYF8Itt25Qv
+Cd0CsSYw9CJkXNr1u1+mObheaY9QYOmztnSJLy4ZO2JsMhqNwuAueIcwmhXOREq7
+kzlnGMgJcuSeAS/OBNj8Zgx0c7QQ0kzc+YmnOCsqoMtPsu/CsXJ4iJiM3Tki/2jT
+bywrTiQwE6R3a/87GREOREX+WLicZBWX3k9/4tBL5XSe1p5wPpuIRQUDvAGNfNHP
+JN7kujDF4SehilF1qtvCygAwvxHFDj+EwhXKNDKJzoZZIM15rAk3k92n2j6nz1qH
+a3xOU05yydOlO6F6w51I1QoDddmkzCRNB0TeO3D6rekHsCK1aDWmC+qRcm2ZFtVz
+sY6fdZN2NEmMQokIh9Opi1f8CSYSizPESMzdu2SF0xVO9n/IGIkn1ksK04O2BZo0
+X3LBPHLfCRsQNY1eF17bj07fYU2oPZKs/XzJiwxkqK6LFvpeAVaYrtg9fqRO/UVe
+QhUIj3BL550ocEpa15xLehLrmwzYiW5zwGjSHQ4EgZluGLCwyKGTh4QswEJRA9Rt
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIE0DCCA7igAwIBAgIJAM5MuKJezXq0MA0GCSqGSIb3DQEBBQUAMIGgMQswCQYD
+VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xGDAW
+BgNVBAoTD1phcGhveWQgU3R1ZGlvczEUMBIGA1UECxMLV2ViU29ja2V0KysxFjAU
+BgNVBAMTDVBldGVyIFRob3Jzb24xJDAiBgkqhkiG9w0BCQEWFXdlYm1hc3RlckB6
+YXBob3lkLmNvbTAeFw0xMTExMTUyMTIwMDZaFw0xMjExMTQyMTIwMDZaMIGgMQsw
+CQYDVQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28x
+GDAWBgNVBAoTD1phcGhveWQgU3R1ZGlvczEUMBIGA1UECxMLV2ViU29ja2V0Kysx
+FjAUBgNVBAMTDVBldGVyIFRob3Jzb24xJDAiBgkqhkiG9w0BCQEWFXdlYm1hc3Rl
+ckB6YXBob3lkLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANR0
+tdwAnIB8I9qRZ7QbzEWY95RpM7GIn0u/9oH90PzdHiE0rXSkKT+yw3XUzH0iw5t0
+5dEwSC+srSP5Vm4cA6kXc94agVVaPW89tGcdP4fHptCruSrzQsDXELCPl5UUvMpA
+YUcGisdXYPN/EeOoqb9wKWxoW5mREsyyeWWS89fYN5qU/d0QpbSvEWghqLbL/ZS2
+hOlXT9LufOeA+vHiV1/T/h5xC7ecIH02YDQw1EnqxbPmkLPcWThztLS9FiufNDRM
+Rhcoaj2b9VDHvDwdbeA0T5v5qNdG34LaapYOelxzQMOtM0f9Dgqehodyxl2qm9mR
+lq432dlOEzDnVCPNHwECAwEAAaOCAQkwggEFMB0GA1UdDgQWBBTTPKfNMnKOykhv
++vKS7vql5JsMyzCB1QYDVR0jBIHNMIHKgBTTPKfNMnKOykhv+vKS7vql5JsMy6GB
+pqSBozCBoDELMAkGA1UEBhMCVVMxETAPBgNVBAgTCElsbGlub2lzMRAwDgYDVQQH
+EwdDaGljYWdvMRgwFgYDVQQKEw9aYXBob3lkIFN0dWRpb3MxFDASBgNVBAsTC1dl
+YlNvY2tldCsrMRYwFAYDVQQDEw1QZXRlciBUaG9yc29uMSQwIgYJKoZIhvcNAQkB
+FhV3ZWJtYXN0ZXJAemFwaG95ZC5jb22CCQDOTLiiXs16tDAMBgNVHRMEBTADAQH/
+MA0GCSqGSIb3DQEBBQUAA4IBAQB+SH0s/hrv5VYqgX6SNLzxdSLvCVsUkCdTpxwY
+wOJ84XmYcXDMhKDtZqLtOtN6pfEwVusFlC9mkieuunztCnWNmsSG83RuljJPjFSi
+1d4Id4bKEQkQ4cfnjoHKivRrViWLnxuNnLzC6tpyGH/35kKWhhr6T58AXerFgVw3
+mHvLPTr1DuhdAZA0ZuvuseVAFFAjI3RetSySwHJE3ak8KswDVfLi6E3XxMVsIWTS
+/iFsC2WwoZQlljya2V/kRYIhu+uCdqJ01wunn2BvmURPSgr4GTBF0FQ9JGpNbXxM
+TAU7oQJgyFc5sCcuEgPTO0dWVQTvdZVgay4tkmduKDRkmJBF
+-----END CERTIFICATE-----
diff --git a/vendor/websocketpp/examples/echo_server_tls/CMakeLists.txt b/vendor/websocketpp/examples/echo_server_tls/CMakeLists.txt
new file mode 100644
index 0000000..99f0c14
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_tls/CMakeLists.txt
@@ -0,0 +1,18 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+
+if (OPENSSL_FOUND)
+
+init_target (echo_server_tls)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+link_openssl()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
+
+endif()
diff --git a/vendor/websocketpp/examples/echo_server_tls/SConscript b/vendor/websocketpp/examples/echo_server_tls/SConscript
new file mode 100644
index 0000000..e24cc4c
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_tls/SConscript
@@ -0,0 +1,24 @@
+## Main development example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env_cpp11.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env.Program('echo_server_tls', ["echo_server_tls.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/echo_server_tls/dh.pem b/vendor/websocketpp/examples/echo_server_tls/dh.pem
new file mode 100644
index 0000000..6b1c74d
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_tls/dh.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEAqxMGKZB8YNV8WQnbJWwwwmifc+PfVRtd1FN5v5aQSsf6dpjX3Zlh
+N1NmgecsQyg4u2EWe4Umta10QzCgYaxf6QdTCg7iprLzFNw7IvWYbQ6du12NMGDr
+hmwA6KQKwbTgPL6mSlSlcK2wTP2FzxDTNffFu10cB/6Fj4kdQjPG0c1Koz/z7OOq
+BuDElJLClS8rjp3z1xvrc7gX95dFa2KaKgOAYDkpe8tfHRhHfJeIVS/whH9hzx6r
+OBg+E5K9JyvayrUoKgPeptRKCqo8A4YevtMLpRxMup0nMUgAIv6+BGTwPAFpwgl/
+8UIVcvjh1v95PwGDM/Q8yvIBJznBYk/e2wIBAg==
+-----END DH PARAMETERS-----
diff --git a/vendor/websocketpp/examples/echo_server_tls/echo_server_tls.cpp b/vendor/websocketpp/examples/echo_server_tls/echo_server_tls.cpp
new file mode 100644
index 0000000..ce04a14
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_tls/echo_server_tls.cpp
@@ -0,0 +1,154 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+ /**
+  * NOTES
+  *
+  * This example uses a number of standard classes through the websocketpp::lib
+  * namespace. This is to allow easy switching between Boost, the C++11 STL, and 
+  * the standalone Asio library. Your program need not use these namespaces if
+  * you do not need this sort of flexibility.
+  */
+
+#include <websocketpp/config/asio.hpp>
+
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+
+typedef websocketpp::server<websocketpp::config::asio_tls> server;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef websocketpp::config::asio::message_type::ptr message_ptr;
+typedef websocketpp::lib::shared_ptr<websocketpp::lib::asio::ssl::context> context_ptr;
+
+void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
+              << " and message: " << msg->get_payload()
+              << std::endl;
+
+    try {
+        s->send(hdl, msg->get_payload(), msg->get_opcode());
+    } catch (const websocketpp::lib::error_code& e) {
+        std::cout << "Echo failed because: " << e
+                  << "(" << e.message() << ")" << std::endl;
+    }
+}
+
+void on_http(server* s, websocketpp::connection_hdl hdl) {
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+    
+    con->set_body("Hello World!");
+    con->set_status(websocketpp::http::status_code::ok);
+}
+
+std::string get_password() {
+    return "test";
+}
+
+// See https://wiki.mozilla.org/Security/Server_Side_TLS for more details about
+// the TLS modes. The code below demonstrates how to implement both the modern
+enum tls_mode {
+    MOZILLA_INTERMEDIATE = 1,
+    MOZILLA_MODERN = 2
+};
+
+context_ptr on_tls_init(tls_mode mode, websocketpp::connection_hdl hdl) {
+    namespace asio = websocketpp::lib::asio;
+
+    std::cout << "on_tls_init called with hdl: " << hdl.lock().get() << std::endl;
+    std::cout << "using TLS mode: " << (mode == MOZILLA_MODERN ? "Mozilla Modern" : "Mozilla Intermediate") << std::endl;
+
+    context_ptr ctx = websocketpp::lib::make_shared<asio::ssl::context>(asio::ssl::context::sslv23);
+
+    try {
+        if (mode == MOZILLA_MODERN) {
+            // Modern disables TLSv1
+            ctx->set_options(asio::ssl::context::default_workarounds |
+                             asio::ssl::context::no_sslv2 |
+                             asio::ssl::context::no_sslv3 |
+                             asio::ssl::context::no_tlsv1 |
+                             asio::ssl::context::single_dh_use);
+        } else {
+            ctx->set_options(asio::ssl::context::default_workarounds |
+                             asio::ssl::context::no_sslv2 |
+                             asio::ssl::context::no_sslv3 |
+                             asio::ssl::context::single_dh_use);
+        }
+        ctx->set_password_callback(bind(&get_password));
+        ctx->use_certificate_chain_file("server.pem");
+        ctx->use_private_key_file("server.pem", asio::ssl::context::pem);
+        
+        // Example method of generating this file:
+        // `openssl dhparam -out dh.pem 2048`
+        // Mozilla Intermediate suggests 1024 as the minimum size to use
+        // Mozilla Modern suggests 2048 as the minimum size to use.
+        ctx->use_tmp_dh_file("dh.pem");
+        
+        std::string ciphers;
+        
+        if (mode == MOZILLA_MODERN) {
+            ciphers = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK";
+        } else {
+            ciphers = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA";
+        }
+        
+        if (SSL_CTX_set_cipher_list(ctx->native_handle() , ciphers.c_str()) != 1) {
+            std::cout << "Error setting cipher list" << std::endl;
+        }
+    } catch (std::exception& e) {
+        std::cout << "Exception: " << e.what() << std::endl;
+    }
+    return ctx;
+}
+
+int main() {
+    // Create a server endpoint
+    server echo_server;
+
+    // Initialize ASIO
+    echo_server.init_asio();
+
+    // Register our message handler
+    echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
+    echo_server.set_http_handler(bind(&on_http,&echo_server,::_1));
+    echo_server.set_tls_init_handler(bind(&on_tls_init,MOZILLA_INTERMEDIATE,::_1));
+
+    // Listen on port 9002
+    echo_server.listen(9002);
+
+    // Start the server accept loop
+    echo_server.start_accept();
+
+    // Start the ASIO io_service run loop
+    echo_server.run();
+
+}
diff --git a/vendor/websocketpp/examples/echo_server_tls/server.pem b/vendor/websocketpp/examples/echo_server_tls/server.pem
new file mode 100644
index 0000000..5196dcf
--- /dev/null
+++ b/vendor/websocketpp/examples/echo_server_tls/server.pem
@@ -0,0 +1,55 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA77v5VbFaq+geVd/RCLXoKTWj/LgXGjiOXBpJZca3o5edi7N1
+Ej41/13jfZ4OxgFIRFAALd+fU4NsObXzskth3rJLmJjUtGajRIPqF2IUVjFMmybQ
+9dUDSqPzd/bG+ul0DP7DNuiBcLC8XNC3/kchPUzVq9gNDk56jXn87kMoIkVXBWQS
+Rwk0yCtELSfwxxRCrGKgQDfXnRdwmkPe42DmKtdGksXJlUhP1UVTAXaSw1Nz64LV
+9bJje/eoDsSe4OxifVVToE6ZxIW+r1jVgrcupeYXQrSHIztl2U/rx2JkGMN0eS+P
+qrsJmkmRBN1cpgmvSV7WoM3hj6Eq71z4Dfv6EwIDAQABAoIBAEXAL19bZsI1mv3p
+TOx34MB8tuXEuhQK+ICbtVdDZhLW/iOzZxCTwSo3qwTVg/7gSKJ3lFXEhprJ1idE
+ZU8u157vyUbw0JJceoxoxSdghgI9/cf2lz2vaHHDGgeBaYt/eSB+z1WeeGrNQUDQ
+CXiWQXmQbWq+Ra4v70BSieDY8UhmzCTRhvfZV80vaY/4SnHxJ9C8Nu8/An7U3pwq
+ccfTaWMp3Q5ztmEnExF6/b1SUsnI8rzFovw/4C50AU09N/Z6zZVFsXgJAT2Kd1Tx
+HfP1vUkWZ/TJ6kcmVIV9U3uMcedBD8Rb/3M0Qdp+eymQ+1oYQ3K3/a2RlUQIeXzf
+hRbE4wECgYEA/WyULrwBsvSMPqK0K9pZpv921Yl6d4bGnpxKze7ltc9o5/LsU35q
+8u29Es7cPyhyUDOsPW8v2CNjw54t+eFGsu59bBvXZNz5gB7hTUEyLntB24cO5PmN
+kVExcMDFC6NgPaauBtUhODievKJ2C8P7sRJDAVKE9KkavDddU7nSEjMCgYEA8ivG
+AqwNXYsiIFjAo4uj3kuBFt8LU/q4m6GXI+9qyxfiJjuF1dROx5qaQGiE85VaBFUu
+gpbnjZH7s+BBgoaQhrB4i6mztljdN1KKuAlnjhB+Fywg8m8N9lAi3wIaxnIEqDkU
+vFiIFPTBCk0U7IZ/OyCrKPQTE9ApWHfBwA/vWKECgYBQixrJg61SkBCms5Vpvprx
+zY2aLniC1o33yRqpOr09PG9OENH1c19QWCjYenBbjmJOhS2/1L+zBQRnHrXkDion
+Ik8wdeTORMDzbF0U7ZyiU0BKIjGkqn/I6LI68LlvinxC+9+hgkltkek5cLTt5lrv
+Gyu6ltx02e4KVdpOiuduKwKBgQC3U0PWigCkK8ttyUIrjG5Evcu/UKH2tPpDdpQ/
+8+JYVIAyiSTLtqjcmcDjuTvMWeeHGCTZXvtzRGvSw5VUBiIqlDTtJU6SX7s3QhkZ
+MKVf+kQ5roJShJeBOzDquWEjkPTNlEiKPErn8lCgR7HrS/XNAPIRUpOOkCp8ekwF
+5Qo/gQKBgAue3TeCeIzxh4PxSAk39Uaj+AaLvlYg8C+ucEodCNQZnJ7jOO0hHkfT
+NvZBes0VukCGlBLOGRQtC3kgtyrerscnDiZOhdnJrhPIdNPC0k/p/uAfh7+C5Sxm
+rCEL0S7kORdEjlIGd5j6ZEN/HZe8FyOYSjbFAoJSlAId9WMSxycQ
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIEpzCCA4+gAwIBAgIJAMlCHvwnJ+F/MA0GCSqGSIb3DQEBCwUAMIGTMQswCQYD
+VQQGEwJVUzELMAkGA1UECBMCSUwxEDAOBgNVBAcTB0NoaWNhZ28xGTAXBgNVBAoT
+EFdlYlNvY2tldCsrIERlbW8xIjAgBgNVBAMTGXV0aWxpdGllcy53ZWJzb2NrZXRw
+cC5vcmcxJjAkBgkqhkiG9w0BCQEWF3dlYnNvY2tldHBwQHphcGhveWQuY29tMB4X
+DTE1MDQyNTE1NTk1M1oXDTE4MDMyODE1NTk1M1owgZMxCzAJBgNVBAYTAlVTMQsw
+CQYDVQQIEwJJTDEQMA4GA1UEBxMHQ2hpY2FnbzEZMBcGA1UEChMQV2ViU29ja2V0
+KysgRGVtbzEiMCAGA1UEAxMZdXRpbGl0aWVzLndlYnNvY2tldHBwLm9yZzEmMCQG
+CSqGSIb3DQEJARYXd2Vic29ja2V0cHBAemFwaG95ZC5jb20wggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDvu/lVsVqr6B5V39EItegpNaP8uBcaOI5cGkll
+xrejl52Ls3USPjX/XeN9ng7GAUhEUAAt359Tg2w5tfOyS2HeskuYmNS0ZqNEg+oX
+YhRWMUybJtD11QNKo/N39sb66XQM/sM26IFwsLxc0Lf+RyE9TNWr2A0OTnqNefzu
+QygiRVcFZBJHCTTIK0QtJ/DHFEKsYqBAN9edF3CaQ97jYOYq10aSxcmVSE/VRVMB
+dpLDU3PrgtX1smN796gOxJ7g7GJ9VVOgTpnEhb6vWNWCty6l5hdCtIcjO2XZT+vH
+YmQYw3R5L4+quwmaSZEE3VymCa9JXtagzeGPoSrvXPgN+/oTAgMBAAGjgfswgfgw
+HQYDVR0OBBYEFAWNBET93ZzSukXGkuGb93CfmUkDMIHIBgNVHSMEgcAwgb2AFAWN
+BET93ZzSukXGkuGb93CfmUkDoYGZpIGWMIGTMQswCQYDVQQGEwJVUzELMAkGA1UE
+CBMCSUwxEDAOBgNVBAcTB0NoaWNhZ28xGTAXBgNVBAoTEFdlYlNvY2tldCsrIERl
+bW8xIjAgBgNVBAMTGXV0aWxpdGllcy53ZWJzb2NrZXRwcC5vcmcxJjAkBgkqhkiG
+9w0BCQEWF3dlYnNvY2tldHBwQHphcGhveWQuY29tggkAyUIe/Ccn4X8wDAYDVR0T
+BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA2DRQSDmo2Q5t8MEjp6jddRIFts5t
+BDBWPSwJ0qvmheFt53MuLds2hhvMn42WGrKtVJiLiDyOWuUZ41REJZb1uaissUuY
+r9pLuP5QLdibx7+/30iDEY0OGTgtSTfgwNx8bIApBSHoZEN3/HaikqplBng2+6u/
+kTe6UnRrBJ+8JOGl+duhCXNPeSyLa2NcrxE9XpWC/k1kC9MTUF+2NuqCtK3zO8ci
+p0mqARWDSrEBYISh3dAOgDFrcX6zj+0MK+iswu3ijEdItGAjxjlQ2t4XT1T/CDbc
+ysHg04TJw7v682+v124GrnrAPYUK34OK8kFVJ60SNYRUi7euOCdTM4Lwkw==
+-----END CERTIFICATE-----
+
diff --git a/vendor/websocketpp/examples/enriched_storage/CMakeLists.txt b/vendor/websocketpp/examples/enriched_storage/CMakeLists.txt
new file mode 100644
index 0000000..78fa7d2
--- /dev/null
+++ b/vendor/websocketpp/examples/enriched_storage/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (enriched_storage)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/enriched_storage/enriched_storage.cpp b/vendor/websocketpp/examples/enriched_storage/enriched_storage.cpp
new file mode 100644
index 0000000..fb23319
--- /dev/null
+++ b/vendor/websocketpp/examples/enriched_storage/enriched_storage.cpp
@@ -0,0 +1,87 @@
+#include <iostream>
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+struct connection_data {
+    int sessionid;
+    std::string name;
+};
+
+struct custom_config : public websocketpp::config::asio {
+    // pull default settings from our core config
+    typedef websocketpp::config::asio core;
+    
+    typedef core::concurrency_type concurrency_type;
+    typedef core::request_type request_type;
+    typedef core::response_type response_type;
+    typedef core::message_type message_type;
+    typedef core::con_msg_manager_type con_msg_manager_type;
+    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
+    typedef core::alog_type alog_type;
+    typedef core::elog_type elog_type;
+    typedef core::rng_type rng_type;
+    typedef core::transport_type transport_type;
+    typedef core::endpoint_base endpoint_base;
+    
+    // Set a custom connection_base class
+    typedef connection_data connection_base;
+};
+
+typedef websocketpp::server<custom_config> server;
+typedef server::connection_ptr connection_ptr;
+
+using websocketpp::connection_hdl;
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+class print_server {
+public:
+    print_server() : m_next_sessionid(1) {
+        m_server.init_asio();
+                
+        m_server.set_open_handler(bind(&print_server::on_open,this,::_1));
+        m_server.set_close_handler(bind(&print_server::on_close,this,::_1));
+        m_server.set_message_handler(bind(&print_server::on_message,this,::_1,::_2));
+    }
+    
+    void on_open(connection_hdl hdl) {
+        connection_ptr con = m_server.get_con_from_hdl(hdl);
+        
+        con->sessionid = m_next_sessionid++;
+    }
+    
+    void on_close(connection_hdl hdl) {
+        connection_ptr con = m_server.get_con_from_hdl(hdl);
+        
+        std::cout << "Closing connection " << con->name 
+                  << " with sessionid " << con->sessionid << std::endl;
+    }
+    
+    void on_message(connection_hdl hdl, server::message_ptr msg) {
+        connection_ptr con = m_server.get_con_from_hdl(hdl);
+        
+        if (con->name.empty()) {
+            con->name = msg->get_payload();
+            std::cout << "Setting name of connection with sessionid " 
+                      << con->sessionid << " to " << con->name << std::endl;
+        } else {
+            std::cout << "Got a message from connection " << con->name 
+                      << " with sessionid " << con->sessionid << std::endl;
+        }
+    }
+    
+    void run(uint16_t port) {
+        m_server.listen(port);
+        m_server.start_accept();
+        m_server.run();
+    }
+private:
+    int m_next_sessionid;
+    server m_server;
+};
+
+int main() {
+    print_server server;
+    server.run(9002);
+}
\ No newline at end of file
diff --git a/vendor/websocketpp/examples/external_io_service/CMakeLists.txt b/vendor/websocketpp/examples/external_io_service/CMakeLists.txt
new file mode 100644
index 0000000..5223da1
--- /dev/null
+++ b/vendor/websocketpp/examples/external_io_service/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (external_io_service)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/external_io_service/SConscript b/vendor/websocketpp/examples/external_io_service/SConscript
new file mode 100644
index 0000000..beb7c1c
--- /dev/null
+++ b/vendor/websocketpp/examples/external_io_service/SConscript
@@ -0,0 +1,23 @@
+## Main development example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('external_io_service', ["external_io_service.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/external_io_service/external_io_service.cpp b/vendor/websocketpp/examples/external_io_service/external_io_service.cpp
new file mode 100644
index 0000000..b6ce3b1
--- /dev/null
+++ b/vendor/websocketpp/examples/external_io_service/external_io_service.cpp
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "tcp_echo_server.hpp"
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+typedef websocketpp::server<websocketpp::config::asio> ws_echo_server;
+
+// Define a callback to handle incoming messages
+void on_message(ws_echo_server* s, websocketpp::connection_hdl hdl, ws_echo_server::message_ptr msg) {
+    std::cout << "on_message called with hdl: " << hdl.lock().get()
+              << " and message: " << msg->get_payload()
+              << std::endl;
+
+    // check for a special command to instruct the server to stop listening so
+    // it can be cleanly exited.
+    if (msg->get_payload() == "stop-listening") {
+        s->stop_listening();
+        return;
+    }
+
+    try {
+        s->send(hdl, msg->get_payload(), msg->get_opcode());
+    } catch (websocketpp::lib::error_code const & e) {
+        std::cout << "Echo failed because: " << e
+                  << "(" << e.message() << ")" << std::endl;
+    }
+}
+
+int main() {
+    asio::io_service service;
+
+    // Add a TCP echo server on port 9003
+    tcp_echo_server custom_http_server(service, 9003);
+
+    // Add a WebSocket echo server on port 9002
+    ws_echo_server ws_server;
+    ws_server.set_access_channels(websocketpp::log::alevel::all);
+    ws_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
+
+    // The only difference in this code between an internal and external
+    // io_service is the different constructor to init_asio
+    ws_server.init_asio(&service);
+
+    // Register our message handler
+    ws_server.set_message_handler(bind(&on_message,&ws_server,::_1,::_2));
+    ws_server.listen(9002);
+    ws_server.start_accept();
+
+    // TODO: add a timer?
+
+    // Start the Asio io_service run loop for all
+    service.run();
+}
\ No newline at end of file
diff --git a/vendor/websocketpp/examples/external_io_service/tcp_echo_server.hpp b/vendor/websocketpp/examples/external_io_service/tcp_echo_server.hpp
new file mode 100644
index 0000000..ef4ce18
--- /dev/null
+++ b/vendor/websocketpp/examples/external_io_service/tcp_echo_server.hpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+ 
+/**
+ * TCP Echo Server
+ *
+ * This file defines a simple TCP Echo Server. It is adapted from the Asio
+ * example: cpp03/echo/async_tcp_echo_server.cpp
+ */ 
+
+#include <websocketpp/common/asio.hpp>
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/common/functional.hpp>
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+namespace asio = websocketpp::lib::asio;
+
+struct tcp_echo_session : websocketpp::lib::enable_shared_from_this<tcp_echo_session> {
+    typedef websocketpp::lib::shared_ptr<tcp_echo_session> ptr;
+    
+    tcp_echo_session(asio::io_service & service) : m_socket(service) {}
+
+    void start() {
+        m_socket.async_read_some(asio::buffer(m_buffer, sizeof(m_buffer)),
+            websocketpp::lib::bind(
+                &tcp_echo_session::handle_read, shared_from_this(), _1, _2));
+    }
+    
+    void handle_read(const asio::error_code & ec, size_t transferred) {
+        if (!ec) {
+            asio::async_write(m_socket,
+                asio::buffer(m_buffer, transferred),
+                    bind(&tcp_echo_session::handle_write, shared_from_this(), _1));
+        }
+    }
+    
+    void handle_write(const asio::error_code & ec) {
+        if (!ec) {
+            m_socket.async_read_some(asio::buffer(m_buffer, sizeof(m_buffer)),
+                bind(&tcp_echo_session::handle_read, shared_from_this(), _1, _2));
+        }
+    }
+
+    asio::ip::tcp::socket m_socket;
+    char m_buffer[1024];
+};
+
+struct tcp_echo_server {
+    tcp_echo_server(asio::io_service & service, short port)
+        : m_service(service)
+        , m_acceptor(service, asio::ip::tcp::endpoint(asio::ip::tcp::v6(), port))
+    {
+        this->start_accept();
+    }
+    
+    void start_accept() {
+        tcp_echo_session::ptr new_session(new tcp_echo_session(m_service));
+        m_acceptor.async_accept(new_session->m_socket,
+            bind(&tcp_echo_server::handle_accept, this, new_session, _1));
+    }
+    
+    void handle_accept(tcp_echo_session::ptr new_session, const asio::error_code & ec) {
+        if (!ec) {
+            new_session->start();
+        }
+        start_accept();
+    }
+
+    asio::io_service & m_service;
+    asio::ip::tcp::acceptor m_acceptor;
+};
diff --git a/vendor/websocketpp/examples/handler_switch/CMakeLists.txt b/vendor/websocketpp/examples/handler_switch/CMakeLists.txt
new file mode 100644
index 0000000..45917d5
--- /dev/null
+++ b/vendor/websocketpp/examples/handler_switch/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (handler_switch)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/handler_switch/handler_switch.cpp b/vendor/websocketpp/examples/handler_switch/handler_switch.cpp
new file mode 100644
index 0000000..c2cf6ff
--- /dev/null
+++ b/vendor/websocketpp/examples/handler_switch/handler_switch.cpp
@@ -0,0 +1,42 @@
+#include <iostream>
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+using websocketpp::connection_hdl;
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+using websocketpp::lib::ref;
+
+void custom_on_msg(server & s, connection_hdl hdl, server::message_ptr msg) {
+        std::cout << "Message sent to custom handler" << std::endl;
+}
+
+void default_on_msg(server & s, connection_hdl hdl, server::message_ptr msg) {
+    std::cout << "Message sent to default handler" << std::endl;
+
+    if (msg->get_payload() == "upgrade") {
+        // Upgrade our connection_hdl to a full connection_ptr
+        server::connection_ptr con = s.get_con_from_hdl(hdl);
+
+        // Change the on message handler for this connection only to
+        // custom_on_mesage
+        con->set_message_handler(bind(&custom_on_msg,ref(s),::_1,::_2));
+        std::cout << "Upgrading connection to custom handler" << std::endl;
+    }
+}
+
+int main() {
+    server s;
+
+    s.set_message_handler(bind(&default_on_msg,ref(s),::_1,::_2));
+
+    s.init_asio();
+    s.listen(9002);
+    s.start_accept();
+
+    s.run();
+}
diff --git a/vendor/websocketpp/examples/iostream_server/CMakeLists.txt b/vendor/websocketpp/examples/iostream_server/CMakeLists.txt
new file mode 100644
index 0000000..962d909
--- /dev/null
+++ b/vendor/websocketpp/examples/iostream_server/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (iostream_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/iostream_server/SConscript b/vendor/websocketpp/examples/iostream_server/SConscript
new file mode 100644
index 0000000..dc90834
--- /dev/null
+++ b/vendor/websocketpp/examples/iostream_server/SConscript
@@ -0,0 +1,23 @@
+## iostream server example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('iostream_server', ["iostream_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/iostream_server/iostream_server.cpp b/vendor/websocketpp/examples/iostream_server/iostream_server.cpp
new file mode 100644
index 0000000..6843659
--- /dev/null
+++ b/vendor/websocketpp/examples/iostream_server/iostream_server.cpp
@@ -0,0 +1,89 @@
+#include <websocketpp/config/core.hpp>
+
+#include <websocketpp/server.hpp>
+
+#include <iostream>
+#include <fstream>
+
+typedef websocketpp::server<websocketpp::config::core> server;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef server::message_ptr message_ptr;
+
+// Define a callback to handle incoming messages
+void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    if (msg->get_opcode() == websocketpp::frame::opcode::text) {
+        s->get_alog().write(websocketpp::log::alevel::app,
+                    "Text Message Received: "+msg->get_payload());
+    } else {
+        s->get_alog().write(websocketpp::log::alevel::app,
+                    "Binary Message Received: "+websocketpp::utility::to_hex(msg->get_payload()));
+    }
+
+    try {
+        s->send(hdl, msg->get_payload(), msg->get_opcode());
+    } catch (const websocketpp::lib::error_code& e) {
+        s->get_alog().write(websocketpp::log::alevel::app,
+                    "Echo Failed: "+e.message());
+    }
+}
+
+int main() {
+    server s;
+    std::ofstream log;
+
+    try {
+        // set up access channels to only log interesting things
+        s.clear_access_channels(websocketpp::log::alevel::all);
+        s.set_access_channels(websocketpp::log::alevel::connect);
+        s.set_access_channels(websocketpp::log::alevel::disconnect);
+        s.set_access_channels(websocketpp::log::alevel::app);
+
+        // Log to a file rather than stdout, as we are using stdout for real
+        // output
+        log.open("output.log");
+        s.get_alog().set_ostream(&log);
+        s.get_elog().set_ostream(&log);
+
+        // print all output to stdout
+        s.register_ostream(&std::cout);
+
+        // Register our message handler
+        s.set_message_handler(bind(&on_message,&s,::_1,::_2));
+
+        server::connection_ptr con = s.get_connection();
+
+        con->start();
+
+        // C++ iostream's don't support the idea of asynchronous i/o. As such
+        // there are two input strategies demonstrated here. Buffered I/O will
+        // read from stdin in chunks until EOF. This works very well for
+        // replaying canned connections as would be done in automated testing.
+        //
+        // If the server is being used live however, assuming input is being
+        // piped from elsewhere in realtime, this strategy will result in small
+        // messages being buffered forever. The non-buffered strategy below
+        // reads characters from stdin one at a time. This is inefficient and
+        // for more serious uses should be replaced with a platform specific
+        // asyncronous i/o technique like select, poll, IOCP, etc
+        bool buffered_io = false;
+
+        if (buffered_io) {
+            std::cin >> *con;
+            con->eof();
+        } else {
+            char a;
+            while(std::cin.get(a)) {
+                con->read_some(&a,1);
+            }
+            con->eof();
+        }
+    } catch (websocketpp::exception const & e) {
+        std::cout << e.what() << std::endl;
+    }
+    log.close();
+}
diff --git a/vendor/websocketpp/examples/print_server/CMakeLists.txt b/vendor/websocketpp/examples/print_server/CMakeLists.txt
new file mode 100644
index 0000000..32c6e0f
--- /dev/null
+++ b/vendor/websocketpp/examples/print_server/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (print_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/print_server/SConscript b/vendor/websocketpp/examples/print_server/SConscript
new file mode 100644
index 0000000..4f0e492
--- /dev/null
+++ b/vendor/websocketpp/examples/print_server/SConscript
@@ -0,0 +1,23 @@
+## Print server example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('print_server', ["print_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/print_server/print_server.cpp b/vendor/websocketpp/examples/print_server/print_server.cpp
new file mode 100644
index 0000000..5f6f444
--- /dev/null
+++ b/vendor/websocketpp/examples/print_server/print_server.cpp
@@ -0,0 +1,24 @@
+#include <iostream>
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+void on_message(websocketpp::connection_hdl, server::message_ptr msg) {
+        std::cout << msg->get_payload() << std::endl;
+}
+
+int main() {
+    server print_server;
+
+    print_server.set_message_handler(&on_message);
+    print_server.set_access_channels(websocketpp::log::alevel::all);
+    print_server.set_error_channels(websocketpp::log::elevel::all);
+
+    print_server.init_asio();
+    print_server.listen(9002);
+    print_server.start_accept();
+
+    print_server.run();
+}
diff --git a/vendor/websocketpp/examples/scratch_client/SConscript b/vendor/websocketpp/examples/scratch_client/SConscript
new file mode 100644
index 0000000..6e7b2ef
--- /dev/null
+++ b/vendor/websocketpp/examples/scratch_client/SConscript
@@ -0,0 +1,24 @@
+## Scratch client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
+   
+Return('prgs')
diff --git a/vendor/websocketpp/examples/scratch_client/scratch_client.cpp b/vendor/websocketpp/examples/scratch_client/scratch_client.cpp
new file mode 100644
index 0000000..a6a1fbc
--- /dev/null
+++ b/vendor/websocketpp/examples/scratch_client/scratch_client.cpp
@@ -0,0 +1,270 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class connection_metadata {
+public:
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
+    }
+    
+    void on_close(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Closed";
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        std::stringstream s;
+        s << "close code: " << con->get_remote_close_code() << " (" 
+          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
+          << "), close reason: " << con->get_remote_close_reason();
+        m_error_reason = s.str();
+    }
+
+    websocketpp::connection_hdl get_hdl() const {
+        return m_hdl;
+    }
+    
+    int get_id() const {
+        return m_id;
+    }
+    
+    std::string get_status() const {
+        return m_status;
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
+private:
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
+};
+
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
+    }
+
+    ~websocket_endpoint() {
+        m_endpoint.stop_perpetual();
+        
+        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
+            if (it->second->get_status() != "Open") {
+                // Only close open connections
+                continue;
+            }
+            
+            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
+            
+            websocketpp::lib::error_code ec;
+            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
+            if (ec) {
+                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
+                          << ec.message() << std::endl;
+            }
+        }
+        
+        m_thread->join();
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr(new connection_metadata(new_id, con->get_handle(), uri));
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_close_handler(websocketpp::lib::bind(
+            &connection_metadata::on_close,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    void close(int id, websocketpp::close::status::value code, std::string reason) {
+        websocketpp::lib::error_code ec;
+        
+        con_list::iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            std::cout << "> No connection found with id " << id << std::endl;
+            return;
+        }
+        
+        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
+        if (ec) {
+            std::cout << "> Error initiating close: " << ec.message() << std::endl;
+        }
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,5) == "close") {
+            std::stringstream ss(input);
+            
+            std::string cmd;
+            int id;
+            int close_code = websocketpp::close::status::normal;
+            std::string reason;
+            
+            ss >> cmd >> id >> close_code;
+            std::getline(ss,reason);
+            
+            endpoint.close(id, close_code, reason);
+        }  else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
diff --git a/vendor/websocketpp/examples/scratch_server/SConscript b/vendor/websocketpp/examples/scratch_server/SConscript
new file mode 100644
index 0000000..bf90f74
--- /dev/null
+++ b/vendor/websocketpp/examples/scratch_server/SConscript
@@ -0,0 +1,24 @@
+## Scratch server example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z']
+   prgs += env_cpp11.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z']
+   prgs += env.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/scratch_server/scratch_server.cpp b/vendor/websocketpp/examples/scratch_server/scratch_server.cpp
new file mode 100644
index 0000000..e37a589
--- /dev/null
+++ b/vendor/websocketpp/examples/scratch_server/scratch_server.cpp
@@ -0,0 +1,106 @@
+/**
+ * This example is presently used as a scratch space. It may or may not be broken
+ * at any given time.
+ */
+
+#include <iostream>
+
+#include <websocketpp/config/debug_asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+struct deflate_config : public websocketpp::config::debug_core {
+    typedef deflate_config type;
+    typedef debug_core base;
+    
+    typedef base::concurrency_type concurrency_type;
+    
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+    
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+    
+    typedef base::rng_type rng_type;
+    
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint 
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config> 
+        transport_type;
+        
+    /// permessage_compress extension
+    struct permessage_deflate_config {};
+
+    typedef websocketpp::extensions::permessage_deflate::enabled
+        <permessage_deflate_config> permessage_deflate_type;
+};
+
+typedef websocketpp::server<deflate_config> server;
+
+typedef server::message_ptr message_ptr;
+
+// Define a callback to handle incoming messages
+void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    /*std::cout << "on_message called with hdl: " << hdl.lock().get() 
+              << " and message (" << msg->get_payload().size() << "): " << msg->get_payload()
+              << std::endl;
+    */
+    try {
+        s->send(hdl, msg->get_payload(), msg->get_opcode());
+    } catch (const websocketpp::lib::error_code& e) {
+        std::cout << "Echo failed because: " << e  
+                  << "(" << e.message() << ")" << std::endl;
+    }
+}
+
+int main(int argc, char * argv[]) {
+	// Create a server endpoint
+    server echo_server;
+	
+	try {
+        // Set logging settings        
+        if (argc > 1 && std::string(argv[1]) == "-d") {
+            echo_server.set_access_channels(websocketpp::log::alevel::all);
+            echo_server.set_error_channels(websocketpp::log::elevel::all);
+        } else {
+            echo_server.set_access_channels(websocketpp::log::alevel::none);
+            echo_server.set_error_channels(websocketpp::log::elevel::none);
+        }
+        
+        // Initialize ASIO
+        echo_server.init_asio();
+        
+        // Register our message handler
+        using websocketpp::lib::placeholders::_1;
+        using websocketpp::lib::placeholders::_2;
+        echo_server.set_message_handler(bind(&on_message,&echo_server,_1,_2));
+        
+        // Listen on port 9002
+        echo_server.listen(9002);
+        
+        // Start the server accept loop
+        echo_server.start_accept();
+	    
+	    // Start the ASIO io_service run loop
+        echo_server.run();
+    } catch (const std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (websocketpp::lib::error_code e) {
+        std::cout << e.message() << std::endl;
+    } catch (...) {
+        std::cout << "other exception" << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/simple_broadcast_server/CMakeLists.txt b/vendor/websocketpp/examples/simple_broadcast_server/CMakeLists.txt
new file mode 100644
index 0000000..5828edb
--- /dev/null
+++ b/vendor/websocketpp/examples/simple_broadcast_server/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (simple_broadcast_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/simple_broadcast_server/simple_broadcast_server.cpp b/vendor/websocketpp/examples/simple_broadcast_server/simple_broadcast_server.cpp
new file mode 100644
index 0000000..7c48476
--- /dev/null
+++ b/vendor/websocketpp/examples/simple_broadcast_server/simple_broadcast_server.cpp
@@ -0,0 +1,51 @@
+#include <set>
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+using websocketpp::connection_hdl;
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+class broadcast_server {
+public:
+    broadcast_server() {
+        m_server.init_asio();
+
+        m_server.set_open_handler(bind(&broadcast_server::on_open,this,::_1));
+        m_server.set_close_handler(bind(&broadcast_server::on_close,this,::_1));
+        m_server.set_message_handler(bind(&broadcast_server::on_message,this,::_1,::_2));
+    }
+
+    void on_open(connection_hdl hdl) {
+        m_connections.insert(hdl);
+    }
+
+    void on_close(connection_hdl hdl) {
+        m_connections.erase(hdl);
+    }
+
+    void on_message(connection_hdl hdl, server::message_ptr msg) {
+        for (auto it : m_connections) {
+            m_server.send(it,msg);
+        }
+    }
+
+    void run(uint16_t port) {
+        m_server.listen(port);
+        m_server.start_accept();
+        m_server.run();
+    }
+private:
+    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
+
+    server m_server;
+    con_list m_connections;
+};
+
+int main() {
+    broadcast_server server;
+    server.run(9002);
+}
diff --git a/vendor/websocketpp/examples/sip_client/CMakeLists.txt b/vendor/websocketpp/examples/sip_client/CMakeLists.txt
new file mode 100644
index 0000000..439fdf1
--- /dev/null
+++ b/vendor/websocketpp/examples/sip_client/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (sip_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/sip_client/README.txt b/vendor/websocketpp/examples/sip_client/README.txt
new file mode 100644
index 0000000..ce3271c
--- /dev/null
+++ b/vendor/websocketpp/examples/sip_client/README.txt
@@ -0,0 +1,22 @@
+
+
+Checkout the project from git
+
+At the top level, run cmake:
+
+  cmake -G 'Unix Makefiles' \
+     -D BUILD_EXAMPLES=ON \
+     -D WEBSOCKETPP_ROOT=/tmp/cm1 \
+     -D ENABLE_CPP11=OFF .
+
+and then make the example:
+
+  make -C examples/sip_client
+
+Now run it:
+
+  bin/sip_client ws://ws-server:80
+
+It has been tested against the repro SIP proxy from reSIProcate
+
+  http://www.resiprocate.org/WebRTC_and_SIP_Over_WebSockets
diff --git a/vendor/websocketpp/examples/sip_client/SConscript b/vendor/websocketpp/examples/sip_client/SConscript
new file mode 100644
index 0000000..fafe7b4
--- /dev/null
+++ b/vendor/websocketpp/examples/sip_client/SConscript
@@ -0,0 +1,23 @@
+## SIP client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/sip_client/sip_client.cpp b/vendor/websocketpp/examples/sip_client/sip_client.cpp
new file mode 100644
index 0000000..66fa857
--- /dev/null
+++ b/vendor/websocketpp/examples/sip_client/sip_client.cpp
@@ -0,0 +1,84 @@
+#include <condition_variable>
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+
+#include <websocketpp/client.hpp>
+
+#include <iostream>
+
+#include <boost/thread/thread.hpp>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef websocketpp::config::asio_client::message_type::ptr message_ptr;
+
+// Create a server endpoint
+client sip_client;
+
+
+bool received;
+
+void on_open(client* c, websocketpp::connection_hdl hdl) {
+    // now it is safe to use the connection
+    std::cout << "connection ready" << std::endl;
+
+    received=false;
+    // Send a SIP OPTIONS message to the server:
+    std::string SIP_msg="OPTIONS sip:carol@chicago.com SIP/2.0\r\nVia: SIP/2.0/WS df7jal23ls0d.invalid;rport;branch=z9hG4bKhjhs8ass877\r\nMax-Forwards: 70\r\nTo: <sip:carol@chicago.com>\r\nFrom: Alice <sip:alice@atlanta.com>;tag=1928301774\r\nCall-ID: a84b4c76e66710\r\nCSeq: 63104 OPTIONS\r\nContact: <sip:alice@pc33.atlanta.com>\r\nAccept: application/sdp\r\nContent-Length: 0\r\n\r\n";
+    sip_client.send(hdl, SIP_msg.c_str(), websocketpp::frame::opcode::text);
+}
+
+void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
+    client::connection_ptr con = sip_client.get_con_from_hdl(hdl);
+
+    std::cout << "Received a reply:" << std::endl;
+    fwrite(msg->get_payload().c_str(), msg->get_payload().size(), 1, stdout);
+    received=true;
+}
+
+int main(int argc, char* argv[]) {
+
+    std::string uri = "ws://localhost:9001";
+
+    if (argc == 2) {
+        uri = argv[1];
+    }
+
+    try {
+        // We expect there to be a lot of errors, so suppress them
+        sip_client.clear_access_channels(websocketpp::log::alevel::all);
+        sip_client.clear_error_channels(websocketpp::log::elevel::all);
+
+        // Initialize ASIO
+        sip_client.init_asio();
+
+        // Register our handlers
+        sip_client.set_open_handler(bind(&on_open,&sip_client,::_1));
+        sip_client.set_message_handler(bind(&on_message,&sip_client,::_1,::_2));
+
+        websocketpp::lib::error_code ec;
+        client::connection_ptr con = sip_client.get_connection(uri, ec);
+
+        // Specify the SIP subprotocol:
+        con->add_subprotocol("sip");
+
+        sip_client.connect(con);
+
+        // Start the ASIO io_service run loop
+        sip_client.run();
+
+        while(!received) {
+            boost::this_thread::sleep(boost::posix_time::milliseconds(100));
+        }
+
+        std::cout << "done" << std::endl;
+
+    } catch (websocketpp::exception const & e) {
+        std::cout << e.what() << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/subprotocol_server/CMakeLists.txt b/vendor/websocketpp/examples/subprotocol_server/CMakeLists.txt
new file mode 100644
index 0000000..fa911eb
--- /dev/null
+++ b/vendor/websocketpp/examples/subprotocol_server/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (subprotocol_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/subprotocol_server/SConscript b/vendor/websocketpp/examples/subprotocol_server/SConscript
new file mode 100644
index 0000000..e97535c
--- /dev/null
+++ b/vendor/websocketpp/examples/subprotocol_server/SConscript
@@ -0,0 +1,23 @@
+## Main development example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('subprotocol_server', ["subprotocol_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/subprotocol_server/subprotocol_server.cpp b/vendor/websocketpp/examples/subprotocol_server/subprotocol_server.cpp
new file mode 100644
index 0000000..9593c01
--- /dev/null
+++ b/vendor/websocketpp/examples/subprotocol_server/subprotocol_server.cpp
@@ -0,0 +1,48 @@
+#include <iostream>
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+using websocketpp::connection_hdl;
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+using websocketpp::lib::ref;
+
+
+bool validate(server & s, connection_hdl hdl) {
+    server::connection_ptr con = s.get_con_from_hdl(hdl);
+
+    std::cout << "Cache-Control: " << con->get_request_header("Cache-Control") << std::endl;
+
+    const std::vector<std::string> & subp_requests = con->get_requested_subprotocols();
+    std::vector<std::string>::const_iterator it;
+
+    for (it = subp_requests.begin(); it != subp_requests.end(); ++it) {
+        std::cout << "Requested: " << *it << std::endl;
+    }
+
+    if (subp_requests.size() > 0) {
+        con->select_subprotocol(subp_requests[0]);
+    }
+
+    return true;
+}
+
+int main() {
+    try {
+        server s;
+
+        s.set_validate_handler(bind(&validate,ref(s),::_1));
+
+        s.init_asio();
+        s.listen(9005);
+        s.start_accept();
+
+        s.run();
+    } catch (websocketpp::exception const & e) {
+        std::cout << e.what() << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/telemetry_client/CMakeLists.txt b/vendor/websocketpp/examples/telemetry_client/CMakeLists.txt
new file mode 100644
index 0000000..04462e9
--- /dev/null
+++ b/vendor/websocketpp/examples/telemetry_client/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (telemetry_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/telemetry_client/SConscript b/vendor/websocketpp/examples/telemetry_client/SConscript
new file mode 100644
index 0000000..62396a5
--- /dev/null
+++ b/vendor/websocketpp/examples/telemetry_client/SConscript
@@ -0,0 +1,23 @@
+## Telemetry client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('telemetry_client', ["telemetry_client.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/telemetry_client/telemetry_client.cpp b/vendor/websocketpp/examples/telemetry_client/telemetry_client.cpp
new file mode 100644
index 0000000..6a57da1
--- /dev/null
+++ b/vendor/websocketpp/examples/telemetry_client/telemetry_client.cpp
@@ -0,0 +1,156 @@
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+// This header pulls in the WebSocket++ abstracted thread support that will
+// select between boost::thread and std::thread based on how the build system
+// is configured.
+#include <websocketpp/common/thread.hpp>
+
+/**
+ * The telemetry client connects to a WebSocket server and sends a message every
+ * second containing an integer count. This example can be used as the basis for
+ * programs where a client connects and pushes data for logging, stress/load
+ * testing, etc.
+ */
+class telemetry_client {
+public:
+    typedef websocketpp::client<websocketpp::config::asio_client> client;
+    typedef websocketpp::lib::lock_guard<websocketpp::lib::mutex> scoped_lock;
+
+    telemetry_client() : m_open(false),m_done(false) {
+        // set up access channels to only log interesting things
+        m_client.clear_access_channels(websocketpp::log::alevel::all);
+        m_client.set_access_channels(websocketpp::log::alevel::connect);
+        m_client.set_access_channels(websocketpp::log::alevel::disconnect);
+        m_client.set_access_channels(websocketpp::log::alevel::app);
+
+        // Initialize the Asio transport policy
+        m_client.init_asio();
+
+        // Bind the handlers we are using
+        using websocketpp::lib::placeholders::_1;
+        using websocketpp::lib::bind;
+        m_client.set_open_handler(bind(&telemetry_client::on_open,this,_1));
+        m_client.set_close_handler(bind(&telemetry_client::on_close,this,_1));
+        m_client.set_fail_handler(bind(&telemetry_client::on_fail,this,_1));
+    }
+
+    // This method will block until the connection is complete
+    void run(const std::string & uri) {
+        // Create a new connection to the given URI
+        websocketpp::lib::error_code ec;
+        client::connection_ptr con = m_client.get_connection(uri, ec);
+        if (ec) {
+            m_client.get_alog().write(websocketpp::log::alevel::app,
+                    "Get Connection Error: "+ec.message());
+            return;
+        }
+
+        // Grab a handle for this connection so we can talk to it in a thread
+        // safe manor after the event loop starts.
+        m_hdl = con->get_handle();
+
+        // Queue the connection. No DNS queries or network connections will be
+        // made until the io_service event loop is run.
+        m_client.connect(con);
+
+        // Create a thread to run the ASIO io_service event loop
+        websocketpp::lib::thread asio_thread(&client::run, &m_client);
+
+        // Create a thread to run the telemetry loop
+        websocketpp::lib::thread telemetry_thread(&telemetry_client::telemetry_loop,this);
+
+        asio_thread.join();
+        telemetry_thread.join();
+    }
+
+    // The open handler will signal that we are ready to start sending telemetry
+    void on_open(websocketpp::connection_hdl) {
+        m_client.get_alog().write(websocketpp::log::alevel::app,
+            "Connection opened, starting telemetry!");
+
+        scoped_lock guard(m_lock);
+        m_open = true;
+    }
+
+    // The close handler will signal that we should stop sending telemetry
+    void on_close(websocketpp::connection_hdl) {
+        m_client.get_alog().write(websocketpp::log::alevel::app,
+            "Connection closed, stopping telemetry!");
+
+        scoped_lock guard(m_lock);
+        m_done = true;
+    }
+
+    // The fail handler will signal that we should stop sending telemetry
+    void on_fail(websocketpp::connection_hdl) {
+        m_client.get_alog().write(websocketpp::log::alevel::app,
+            "Connection failed, stopping telemetry!");
+
+        scoped_lock guard(m_lock);
+        m_done = true;
+    }
+
+    void telemetry_loop() {
+        uint64_t count = 0;
+        std::stringstream val;
+        websocketpp::lib::error_code ec;
+
+        while(1) {
+            bool wait = false;
+
+            {
+                scoped_lock guard(m_lock);
+                // If the connection has been closed, stop generating telemetry
+                if (m_done) {break;}
+
+                // If the connection hasn't been opened yet wait a bit and retry
+                if (!m_open) {
+                    wait = true;
+                }
+            }
+
+            if (wait) {
+                sleep(1);
+                continue;
+            }
+
+            val.str("");
+            val << "count is " << count++;
+
+            m_client.get_alog().write(websocketpp::log::alevel::app, val.str());
+            m_client.send(m_hdl,val.str(),websocketpp::frame::opcode::text,ec);
+
+            // The most likely error that we will get is that the connection is
+            // not in the right state. Usually this means we tried to send a
+            // message to a connection that was closed or in the process of
+            // closing. While many errors here can be easily recovered from,
+            // in this simple example, we'll stop the telemetry loop.
+            if (ec) {
+                m_client.get_alog().write(websocketpp::log::alevel::app,
+                    "Send Error: "+ec.message());
+                break;
+            }
+
+            sleep(1);
+        }
+    }
+private:
+    client m_client;
+    websocketpp::connection_hdl m_hdl;
+    websocketpp::lib::mutex m_lock;
+    bool m_open;
+    bool m_done;
+};
+
+int main(int argc, char* argv[]) {
+    telemetry_client c;
+
+    std::string uri = "ws://localhost:9002";
+
+    if (argc == 2) {
+        uri = argv[1];
+    }
+
+    c.run(uri);
+}
diff --git a/vendor/websocketpp/examples/telemetry_server/CMakeLists.txt b/vendor/websocketpp/examples/telemetry_server/CMakeLists.txt
new file mode 100644
index 0000000..845fe86
--- /dev/null
+++ b/vendor/websocketpp/examples/telemetry_server/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (telemetry_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
diff --git a/vendor/websocketpp/examples/telemetry_server/SConscript b/vendor/websocketpp/examples/telemetry_server/SConscript
new file mode 100644
index 0000000..1b8ff22
--- /dev/null
+++ b/vendor/websocketpp/examples/telemetry_server/SConscript
@@ -0,0 +1,23 @@
+## Main development example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('telemetry_server', ["telemetry_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/telemetry_server/index.html b/vendor/websocketpp/examples/telemetry_server/index.html
new file mode 100644
index 0000000..def50dd
--- /dev/null
+++ b/vendor/websocketpp/examples/telemetry_server/index.html
@@ -0,0 +1,85 @@
+<!doctype html>
+<html>
+<head>
+<title>WebSocket++ Telemetry Client</title>
+</head>
+<body>
+
+<script type="text/javascript">
+var ws;
+var url;
+
+function connect() {
+	url = document.getElementById("server_url").value;
+	
+	if ("WebSocket" in window) {
+		ws = new WebSocket(url);
+	} else if ("MozWebSocket" in window) {
+		ws = new MozWebSocket(url);
+	} else {
+		document.getElementById("messages").innerHTML += "This Browser does not support WebSockets<br />";
+		return;
+	}
+	ws.onopen = function(e) {
+		document.getElementById("messages").innerHTML += "Client: A connection to "+ws.url+" has been opened.<br />";
+		
+		document.getElementById("server_url").disabled = true;
+		document.getElementById("toggle_connect").innerHTML = "Disconnect";
+	};
+	
+	ws.onerror = function(e) {
+		document.getElementById("messages").innerHTML += "Client: An error occured, see console log for more details.<br />";
+		console.log(e);
+	};
+	
+	ws.onclose = function(e) {
+		document.getElementById("messages").innerHTML += "Client: The connection to "+url+" was closed. ["+e.code+(e.reason != "" ? ","+e.reason : "")+"]<br />";
+	    cleanup_disconnect();
+	};
+	
+	ws.onmessage = function(e) {
+		document.getElementById("messages").innerHTML += "Server: "+e.data+"<br />";
+	};
+}
+
+function disconnect() {
+	ws.close();
+	cleanup_disconnect();
+}
+
+function cleanup_disconnect() {
+    document.getElementById("server_url").disabled = false;
+	document.getElementById("toggle_connect").innerHTML = "Connect";
+}
+
+function toggle_connect() {
+	if (document.getElementById("server_url").disabled === false) {
+		connect();
+	} else {
+		disconnect();
+	}
+}
+</script>
+
+<style>
+body,html {
+	margin: 0px;
+	padding: 0px;
+}
+#controls {
+	float:right;
+	background-color: #999;
+}
+
+</style>
+
+<div id="controls">
+	<div id="server">
+	<input type="text" name="server_url" id="server_url" value="ws://localhost:9002" /><br />
+	<button id="toggle_connect" onclick="toggle_connect();">Connect</button>
+	</div>
+</div>
+<div id="messages"></div>
+
+</body>
+</html>
diff --git a/vendor/websocketpp/examples/telemetry_server/telemetry_server.cpp b/vendor/websocketpp/examples/telemetry_server/telemetry_server.cpp
new file mode 100644
index 0000000..3f8e604
--- /dev/null
+++ b/vendor/websocketpp/examples/telemetry_server/telemetry_server.cpp
@@ -0,0 +1,203 @@
+#include <websocketpp/config/asio_no_tls.hpp>
+
+#include <websocketpp/server.hpp>
+
+#include <fstream>
+#include <iostream>
+#include <set>
+#include <streambuf>
+#include <string>
+
+/**
+ * The telemetry server accepts connections and sends a message every second to
+ * each client containing an integer count. This example can be used as the
+ * basis for programs that expose a stream of telemetry data for logging,
+ * dashboards, etc.
+ *
+ * This example uses the timer based concurrency method and is self contained
+ * and singled threaded. Refer to telemetry client for an example of a similar
+ * telemetry setup using threads rather than timers.
+ *
+ * This example also includes an example simple HTTP server that serves a web
+ * dashboard displaying the count. This simple design is suitable for use 
+ * delivering a small number of files to a small number of clients. It is ideal
+ * for cases like embedded dashboards that don't want the complexity of an extra
+ * HTTP server to serve static files.
+ *
+ * This design *will* fall over under high traffic or DoS conditions. In such
+ * cases you are much better off proxying to a real HTTP server for the http
+ * requests.
+ */
+class telemetry_server {
+public:
+    typedef websocketpp::connection_hdl connection_hdl;
+    typedef websocketpp::server<websocketpp::config::asio> server;
+
+    telemetry_server() : m_count(0) {
+        // set up access channels to only log interesting things
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.set_access_channels(websocketpp::log::alevel::access_core);
+        m_endpoint.set_access_channels(websocketpp::log::alevel::app);
+
+        // Initialize the Asio transport policy
+        m_endpoint.init_asio();
+
+        // Bind the handlers we are using
+        using websocketpp::lib::placeholders::_1;
+        using websocketpp::lib::bind;
+        m_endpoint.set_open_handler(bind(&telemetry_server::on_open,this,_1));
+        m_endpoint.set_close_handler(bind(&telemetry_server::on_close,this,_1));
+        m_endpoint.set_http_handler(bind(&telemetry_server::on_http,this,_1));
+    }
+
+    void run(std::string docroot, uint16_t port) {
+        std::stringstream ss;
+        ss << "Running telemetry server on port "<< port <<" using docroot=" << docroot;
+        m_endpoint.get_alog().write(websocketpp::log::alevel::app,ss.str());
+        
+        m_docroot = docroot;
+        
+        // listen on specified port
+        m_endpoint.listen(port);
+
+        // Start the server accept loop
+        m_endpoint.start_accept();
+
+        // Set the initial timer to start telemetry
+        set_timer();
+
+        // Start the ASIO io_service run loop
+        try {
+            m_endpoint.run();
+        } catch (websocketpp::exception const & e) {
+            std::cout << e.what() << std::endl;
+        }
+    }
+
+    void set_timer() {
+        m_timer = m_endpoint.set_timer(
+            1000,
+            websocketpp::lib::bind(
+                &telemetry_server::on_timer,
+                this,
+                websocketpp::lib::placeholders::_1
+            )
+        );
+    }
+
+    void on_timer(websocketpp::lib::error_code const & ec) {
+        if (ec) {
+            // there was an error, stop telemetry
+            m_endpoint.get_alog().write(websocketpp::log::alevel::app,
+                    "Timer Error: "+ec.message());
+            return;
+        }
+        
+        std::stringstream val;
+        val << "count is " << m_count++;
+        
+        // Broadcast count to all connections
+        con_list::iterator it;
+        for (it = m_connections.begin(); it != m_connections.end(); ++it) {
+            m_endpoint.send(*it,val.str(),websocketpp::frame::opcode::text);
+        }
+        
+        // set timer for next telemetry check
+        set_timer();
+    }
+
+    void on_http(connection_hdl hdl) {
+        // Upgrade our connection handle to a full connection_ptr
+        server::connection_ptr con = m_endpoint.get_con_from_hdl(hdl);
+    
+        std::ifstream file;
+        std::string filename = con->get_resource();
+        std::string response;
+    
+        m_endpoint.get_alog().write(websocketpp::log::alevel::app,
+            "http request1: "+filename);
+    
+        if (filename == "/") {
+            filename = m_docroot+"index.html";
+        } else {
+            filename = m_docroot+filename.substr(1);
+        }
+        
+        m_endpoint.get_alog().write(websocketpp::log::alevel::app,
+            "http request2: "+filename);
+    
+        file.open(filename.c_str(), std::ios::in);
+        if (!file) {
+            // 404 error
+            std::stringstream ss;
+        
+            ss << "<!doctype html><html><head>"
+               << "<title>Error 404 (Resource not found)</title><body>"
+               << "<h1>Error 404</h1>"
+               << "<p>The requested URL " << filename << " was not found on this server.</p>"
+               << "</body></head></html>";
+        
+            con->set_body(ss.str());
+            con->set_status(websocketpp::http::status_code::not_found);
+            return;
+        }
+    
+        file.seekg(0, std::ios::end);
+        response.reserve(file.tellg());
+        file.seekg(0, std::ios::beg);
+    
+        response.assign((std::istreambuf_iterator<char>(file)),
+                        std::istreambuf_iterator<char>());
+    
+        con->set_body(response);
+        con->set_status(websocketpp::http::status_code::ok);
+    }
+
+    void on_open(connection_hdl hdl) {
+        m_connections.insert(hdl);
+    }
+
+    void on_close(connection_hdl hdl) {
+        m_connections.erase(hdl);
+    }
+private:
+    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
+    
+    server m_endpoint;
+    con_list m_connections;
+    server::timer_ptr m_timer;
+    
+    std::string m_docroot;
+    
+    // Telemetry data
+    uint64_t m_count;
+};
+
+int main(int argc, char* argv[]) {
+    telemetry_server s;
+
+    std::string docroot;
+    uint16_t port = 9002;
+
+    if (argc == 1) {
+        std::cout << "Usage: telemetry_server [documentroot] [port]" << std::endl;
+        return 1;
+    }
+    
+    if (argc >= 2) {
+        docroot = std::string(argv[1]);
+    }
+        
+    if (argc >= 3) {
+        int i = atoi(argv[2]);
+        if (i <= 0 || i > 65535) {
+            std::cout << "invalid port" << std::endl;
+            return 1;
+        }
+        
+        port = uint16_t(i);
+    }
+
+    s.run(docroot, port);
+    return 0;
+}
diff --git a/vendor/websocketpp/examples/testee_client/CMakeLists.txt b/vendor/websocketpp/examples/testee_client/CMakeLists.txt
new file mode 100644
index 0000000..e89fcc7
--- /dev/null
+++ b/vendor/websocketpp/examples/testee_client/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+if (ZLIB_FOUND)
+
+init_target (testee_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+link_zlib()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
+
+endif()
\ No newline at end of file
diff --git a/vendor/websocketpp/examples/testee_client/SConscript b/vendor/websocketpp/examples/testee_client/SConscript
new file mode 100644
index 0000000..64f0ef1
--- /dev/null
+++ b/vendor/websocketpp/examples/testee_client/SConscript
@@ -0,0 +1,23 @@
+## Autobahn test client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
+   prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + ['z']
+   prgs += env.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/testee_client/testee_client.cpp b/vendor/websocketpp/examples/testee_client/testee_client.cpp
new file mode 100644
index 0000000..b66e633
--- /dev/null
+++ b/vendor/websocketpp/examples/testee_client/testee_client.cpp
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+#include <iostream>
+
+struct deflate_config : public websocketpp::config::asio_client {
+    typedef deflate_config type;
+    typedef asio_client base;
+    
+    typedef base::concurrency_type concurrency_type;
+    
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+    
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+    
+    typedef base::rng_type rng_type;
+    
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint 
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config> 
+        transport_type;
+        
+    /// permessage_compress extension
+    struct permessage_deflate_config {};
+
+    typedef websocketpp::extensions::permessage_deflate::enabled
+        <permessage_deflate_config> permessage_deflate_type;
+};
+
+typedef websocketpp::client<deflate_config> client;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef websocketpp::config::asio_client::message_type::ptr message_ptr;
+
+int case_count = 0;
+
+void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
+    client::connection_ptr con = c->get_con_from_hdl(hdl);
+
+    if (con->get_resource() == "/getCaseCount") {
+        std::cout << "Detected " << msg->get_payload() << " test cases."
+                  << std::endl;
+        case_count = atoi(msg->get_payload().c_str());
+    } else {
+        c->send(hdl, msg->get_payload(), msg->get_opcode());
+    }
+}
+
+int main(int argc, char* argv[]) {
+    // Create a server endpoint
+    client c;
+
+    std::string uri = "ws://localhost:9001";
+
+    if (argc == 2) {
+        uri = argv[1];
+    }
+
+    try {
+        // We expect there to be a lot of errors, so suppress them
+        c.clear_access_channels(websocketpp::log::alevel::all);
+        c.clear_error_channels(websocketpp::log::elevel::all);
+
+        // Initialize ASIO
+        c.init_asio();
+
+        // Register our handlers
+        c.set_message_handler(bind(&on_message,&c,::_1,::_2));
+
+        websocketpp::lib::error_code ec;
+        client::connection_ptr con = c.get_connection(uri+"/getCaseCount", ec);
+        c.connect(con);
+
+        // Start the ASIO io_service run loop
+        c.run();
+
+        std::cout << "case count: " << case_count << std::endl;
+
+        for (int i = 1; i <= case_count; i++) {
+            c.reset();
+
+            std::stringstream url;
+
+            url << uri << "/runCase?case=" << i << "&agent="
+                << websocketpp::user_agent;
+
+            con = c.get_connection(url.str(), ec);
+
+            c.connect(con);
+
+            c.run();
+        }
+
+        std::cout << "done" << std::endl;
+
+    } catch (websocketpp::exception const & e) {
+        std::cout << e.what() << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/testee_server/CMakeLists.txt b/vendor/websocketpp/examples/testee_server/CMakeLists.txt
new file mode 100644
index 0000000..c95e42d
--- /dev/null
+++ b/vendor/websocketpp/examples/testee_server/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+if (ZLIB_FOUND)
+
+init_target (testee_server)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+link_zlib()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
+
+endif()
\ No newline at end of file
diff --git a/vendor/websocketpp/examples/testee_server/SConscript b/vendor/websocketpp/examples/testee_server/SConscript
new file mode 100644
index 0000000..3c75f4f
--- /dev/null
+++ b/vendor/websocketpp/examples/testee_server/SConscript
@@ -0,0 +1,23 @@
+## Autobahn Testee Server
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
+   prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + ['z']
+   prgs += env.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
diff --git a/vendor/websocketpp/examples/testee_server/testee_server.cpp b/vendor/websocketpp/examples/testee_server/testee_server.cpp
new file mode 100644
index 0000000..9ac9a7d
--- /dev/null
+++ b/vendor/websocketpp/examples/testee_server/testee_server.cpp
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+#include <iostream>
+
+struct testee_config : public websocketpp::config::asio {
+    // pull default settings from our core config
+    typedef websocketpp::config::asio core;
+
+    typedef core::concurrency_type concurrency_type;
+    typedef core::request_type request_type;
+    typedef core::response_type response_type;
+    typedef core::message_type message_type;
+    typedef core::con_msg_manager_type con_msg_manager_type;
+    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef core::alog_type alog_type;
+    typedef core::elog_type elog_type;
+    typedef core::rng_type rng_type;
+    typedef core::endpoint_base endpoint_base;
+
+    static bool const enable_multithreading = true;
+
+    struct transport_config : public core::transport_config {
+        typedef core::concurrency_type concurrency_type;
+        typedef core::elog_type elog_type;
+        typedef core::alog_type alog_type;
+        typedef core::request_type request_type;
+        typedef core::response_type response_type;
+
+        static bool const enable_multithreading = true;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+
+    static const websocketpp::log::level elog_level =
+        websocketpp::log::elevel::none;
+    static const websocketpp::log::level alog_level =
+        websocketpp::log::alevel::none;
+        
+    /// permessage_compress extension
+    struct permessage_deflate_config {};
+
+    typedef websocketpp::extensions::permessage_deflate::enabled
+        <permessage_deflate_config> permessage_deflate_type;
+};
+
+typedef websocketpp::server<testee_config> server;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef server::message_ptr message_ptr;
+
+// Define a callback to handle incoming messages
+void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    s->send(hdl, msg->get_payload(), msg->get_opcode());
+}
+
+void on_socket_init(websocketpp::connection_hdl, boost::asio::ip::tcp::socket & s) {
+    boost::asio::ip::tcp::no_delay option(true);
+    s.set_option(option);
+}
+
+int main(int argc, char * argv[]) {
+    // Create a server endpoint
+    server testee_server;
+
+    short port = 9002;
+    size_t num_threads = 1;
+
+    if (argc == 3) {
+        port = atoi(argv[1]);
+        num_threads = atoi(argv[2]);
+    }
+
+    try {
+        // Total silence
+        testee_server.clear_access_channels(websocketpp::log::alevel::all);
+        testee_server.clear_error_channels(websocketpp::log::alevel::all);
+
+        // Initialize ASIO
+        testee_server.init_asio();
+        testee_server.set_reuse_addr(true);
+
+        // Register our message handler
+        testee_server.set_message_handler(bind(&on_message,&testee_server,::_1,::_2));
+        testee_server.set_socket_init_handler(bind(&on_socket_init,::_1,::_2));
+
+        // Listen on specified port with extended listen backlog
+        testee_server.set_listen_backlog(8192);
+        testee_server.listen(port);
+
+        // Start the server accept loop
+        testee_server.start_accept();
+
+        // Start the ASIO io_service run loop
+        if (num_threads == 1) {
+            testee_server.run();
+        } else {
+            typedef websocketpp::lib::shared_ptr<websocketpp::lib::thread> thread_ptr;
+            std::vector<thread_ptr> ts;
+            for (size_t i = 0; i < num_threads; i++) {
+                ts.push_back(websocketpp::lib::make_shared<websocketpp::lib::thread>(&server::run, &testee_server));
+            }
+
+            for (size_t i = 0; i < num_threads; i++) {
+                ts[i]->join();
+            }
+        }
+
+    } catch (websocketpp::exception const & e) {
+        std::cout << "exception: " << e.what() << std::endl;
+    }
+}
diff --git a/vendor/websocketpp/examples/utility_client/CMakeLists.txt b/vendor/websocketpp/examples/utility_client/CMakeLists.txt
new file mode 100644
index 0000000..fbfd868
--- /dev/null
+++ b/vendor/websocketpp/examples/utility_client/CMakeLists.txt
@@ -0,0 +1,13 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (utility_client)
+
+build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
+
diff --git a/vendor/websocketpp/examples/utility_client/SConscript b/vendor/websocketpp/examples/utility_client/SConscript
new file mode 100644
index 0000000..6e6cd8c
--- /dev/null
+++ b/vendor/websocketpp/examples/utility_client/SConscript
@@ -0,0 +1,23 @@
+## Utility client example
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+prgs = []
+
+# if a C++11 environment is available build using that, otherwise use boost
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
+else:
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
+   prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
+
+Return('prgs')
\ No newline at end of file
diff --git a/vendor/websocketpp/examples/utility_client/utility_client.cpp b/vendor/websocketpp/examples/utility_client/utility_client.cpp
new file mode 100644
index 0000000..aa43b8e
--- /dev/null
+++ b/vendor/websocketpp/examples/utility_client/utility_client.cpp
@@ -0,0 +1,325 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class connection_metadata {
+public:
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
+    }
+    
+    void on_close(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Closed";
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        std::stringstream s;
+        s << "close code: " << con->get_remote_close_code() << " (" 
+          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
+          << "), close reason: " << con->get_remote_close_reason();
+        m_error_reason = s.str();
+    }
+
+    void on_message(websocketpp::connection_hdl, client::message_ptr msg) {
+        if (msg->get_opcode() == websocketpp::frame::opcode::text) {
+            m_messages.push_back("<< " + msg->get_payload());
+        } else {
+            m_messages.push_back("<< " + websocketpp::utility::to_hex(msg->get_payload()));
+        }
+    }
+
+    websocketpp::connection_hdl get_hdl() const {
+        return m_hdl;
+    }
+    
+    int get_id() const {
+        return m_id;
+    }
+    
+    std::string get_status() const {
+        return m_status;
+    }
+
+    void record_sent_message(std::string message) {
+        m_messages.push_back(">> " + message);
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
+private:
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
+    std::vector<std::string> m_messages;
+};
+
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason) << "\n";
+    out << "> Messages Processed: (" << data.m_messages.size() << ") \n";
+
+    std::vector<std::string>::const_iterator it;
+    for (it = data.m_messages.begin(); it != data.m_messages.end(); ++it) {
+        out << *it << "\n";
+    }
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+    }
+
+    ~websocket_endpoint() {
+        m_endpoint.stop_perpetual();
+        
+        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
+            if (it->second->get_status() != "Open") {
+                // Only close open connections
+                continue;
+            }
+            
+            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
+            
+            websocketpp::lib::error_code ec;
+            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
+            if (ec) {
+                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
+                          << ec.message() << std::endl;
+            }
+        }
+        
+        m_thread->join();
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_close_handler(websocketpp::lib::bind(
+            &connection_metadata::on_close,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_message_handler(websocketpp::lib::bind(
+            &connection_metadata::on_message,
+            metadata_ptr,
+            websocketpp::lib::placeholders::_1,
+            websocketpp::lib::placeholders::_2
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    void close(int id, websocketpp::close::status::value code, std::string reason) {
+        websocketpp::lib::error_code ec;
+        
+        con_list::iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            std::cout << "> No connection found with id " << id << std::endl;
+            return;
+        }
+        
+        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
+        if (ec) {
+            std::cout << "> Error initiating close: " << ec.message() << std::endl;
+        }
+    }
+
+    void send(int id, std::string message) {
+        websocketpp::lib::error_code ec;
+        
+        con_list::iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            std::cout << "> No connection found with id " << id << std::endl;
+            return;
+        }
+        
+        m_endpoint.send(metadata_it->second->get_hdl(), message, websocketpp::frame::opcode::text, ec);
+        if (ec) {
+            std::cout << "> Error sending message: " << ec.message() << std::endl;
+            return;
+        }
+        
+        metadata_it->second->record_sent_message(message);
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "send <connection id> <message>\n"
+                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,4) == "send") {
+            std::stringstream ss(input);
+            
+            std::string cmd;
+            int id;
+            std::string message;
+            
+            ss >> cmd >> id;
+            std::getline(ss,message);
+            
+            endpoint.send(id, message);
+        } else if (input.substr(0,5) == "close") {
+            std::stringstream ss(input);
+            
+            std::string cmd;
+            int id;
+            int close_code = websocketpp::close::status::normal;
+            std::string reason;
+            
+            ss >> cmd >> id >> close_code;
+            std::getline(ss,reason);
+            
+            endpoint.close(id, close_code, reason);
+        } else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
\ No newline at end of file
diff --git a/vendor/websocketpp/readme.md b/vendor/websocketpp/readme.md
new file mode 100644
index 0000000..0de30f8
--- /dev/null
+++ b/vendor/websocketpp/readme.md
@@ -0,0 +1,49 @@
+WebSocket++ (0.7.0)
+==========================
+
+WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket
+Protocol. It allows integrating WebSocket client and server functionality into
+C++ programs. It uses interchangeable network transport modules including one
+based on raw char buffers, one based on C++ iostreams, and one based on Asio 
+(either via Boost or standalone). End users can write additional transport
+policies to support other networking or event libraries as needed.
+
+Major Features
+==============
+* Full support for RFC6455
+* Partial support for Hixie 76 / Hybi 00, 07-17 draft specs (server only)
+* Message/event based interface
+* Supports secure WebSockets (TLS), IPv6, and explicit proxies.
+* Flexible dependency management (C++11 Standard Library or Boost)
+* Interchangeable network transport modules (raw, iostream, Asio, or custom)
+* Portable/cross platform (Posix/Windows, 32/64bit, Intel/ARM/PPC)
+* Thread-safe
+
+Get Involved
+============
+
+[![Build Status](https://travis-ci.org/zaphoyd/websocketpp.png)](https://travis-ci.org/zaphoyd/websocketpp)
+
+**Project Website**
+http://www.zaphoyd.com/websocketpp/
+
+**User Manual**
+http://www.zaphoyd.com/websocketpp/manual/
+
+**GitHub Repository**
+https://github.com/zaphoyd/websocketpp/
+
+GitHub pull requests should be submitted to the `develop` branch.
+
+**Announcements Mailing List**
+http://groups.google.com/group/websocketpp-announcements/
+
+**IRC Channel**
+ #websocketpp (freenode)
+
+**Discussion / Development / Support Mailing List / Forum**
+http://groups.google.com/group/websocketpp/
+
+Author
+======
+Peter Thorson - websocketpp@zaphoyd.com
diff --git a/vendor/websocketpp/roadmap.md b/vendor/websocketpp/roadmap.md
new file mode 100644
index 0000000..b35c54a
--- /dev/null
+++ b/vendor/websocketpp/roadmap.md
@@ -0,0 +1,43 @@
+Complete & Tested:
+- Server and client roles pass all Autobahn v0.5.9 test suite tests strictly
+- Streaming UTF8 validation
+- random number generation
+- iostream based transport
+- C++11 support
+- LLVM/Clang support
+- GCC support
+- 64 bit support
+- 32 bit support
+- Logging
+- Client role
+- message_handler
+- ping_handler
+- pong_handler
+- open_handler
+- close_handler
+- echo_server & echo_server_tls
+- External io_service support
+- TLS support
+- exception/error handling
+- Timeouts
+- Subprotocol negotiation
+- validate_handler
+- Hybi 00/Hixie 76 legacy protocol support
+- Outgoing Proxy Support
+- socket_init_handler
+- tls_init_handler
+- tcp_init_handler
+
+Ongoing work
+- Performance tuning
+- PowerPC support
+- Visual Studio / Windows support
+- CMake build/install support
+- http_handler
+
+Future feature roadmap
+- Extension support
+- permessage_compress extension
+- Message buffer pool
+- flow control
+- tutorials & documentation
diff --git a/vendor/websocketpp/test/connection/CMakeLists.txt b/vendor/websocketpp/test/connection/CMakeLists.txt
new file mode 100644
index 0000000..cc501c7
--- /dev/null
+++ b/vendor/websocketpp/test/connection/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (test_connection)
+
+build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/vendor/websocketpp/test/connection/SConscript b/vendor/websocketpp/test/connection/SConscript
new file mode 100644
index 0000000..4ed7a4e
--- /dev/null
+++ b/vendor/websocketpp/test/connection/SConscript
@@ -0,0 +1,25 @@
+## connection unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
+
+objs = env.Object('connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS)
+objs = env.Object('connection_tu2_boost.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_connection_boost', ["connection_boost.o","connection_tu2_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   objs += env_cpp11.Object('connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('connection_tu2_stl.o', ["connection_tu2.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_connection_stl', ["connection_stl.o","connection_tu2_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/connection/connection.cpp b/vendor/websocketpp/test/connection/connection.cpp
new file mode 100644
index 0000000..36b6d14
--- /dev/null
+++ b/vendor/websocketpp/test/connection/connection.cpp
@@ -0,0 +1,530 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE connection
+#include <boost/test/unit_test.hpp>
+
+#include "connection_tu2.hpp"
+
+// Include special debugging transport
+//#include <websocketpp/config/minimal_client.hpp>
+#include <websocketpp/transport/debug/endpoint.hpp>
+
+// NOTE: these tests currently test against hardcoded output values. I am not
+// sure how problematic this will be. If issues arise like order of headers the
+// output should be parsed by http::response and have values checked directly
+
+BOOST_AUTO_TEST_CASE( basic_http_request ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 426 Upgrade Required\r\nServer: " +
+                         std::string(websocketpp::user_agent)+"\r\n\r\n";
+
+    std::string o2 = run_server_test(input);
+
+    BOOST_CHECK(o2 == output);
+}
+
+struct connection_extension {
+    connection_extension() : extension_value(5) {}
+
+    int extension_method() {
+        return extension_value;
+    }
+
+    bool is_server() const {
+        return false;
+    }
+
+    int extension_value;
+};
+
+struct stub_config : public websocketpp::config::core {
+    typedef core::concurrency_type concurrency_type;
+
+    typedef core::request_type request_type;
+    typedef core::response_type response_type;
+
+    typedef core::message_type message_type;
+    typedef core::con_msg_manager_type con_msg_manager_type;
+    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef core::alog_type alog_type;
+    typedef core::elog_type elog_type;
+
+    typedef core::rng_type rng_type;
+
+    typedef core::transport_type transport_type;
+
+    typedef core::endpoint_base endpoint_base;
+    typedef connection_extension connection_base;
+};
+
+struct debug_config_client : public websocketpp::config::core {
+    typedef debug_config_client type;
+    
+    typedef core::concurrency_type concurrency_type;
+
+    typedef core::request_type request_type;
+    typedef core::response_type response_type;
+
+    typedef core::message_type message_type;
+    typedef core::con_msg_manager_type con_msg_manager_type;
+    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef core::alog_type alog_type;
+    typedef core::elog_type elog_type;
+
+    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
+
+    struct transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::elog_type elog_type;
+        typedef type::alog_type alog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+
+        /// Controls compile time enabling/disabling of thread syncronization
+        /// code Disabling can provide a minor performance improvement to single
+        /// threaded applications
+        static bool const enable_multithreading = true;
+
+        /// Default timer values (in ms)
+        static const long timeout_socket_pre_init = 5000;
+        static const long timeout_proxy = 5000;
+        static const long timeout_socket_post_init = 5000;
+        static const long timeout_connect = 5000;
+        static const long timeout_socket_shutdown = 5000;
+    };
+
+    /// Transport Endpoint Component
+    typedef websocketpp::transport::debug::endpoint<transport_config>
+        transport_type;
+
+    typedef core::endpoint_base endpoint_base;
+    typedef connection_extension connection_base;
+    
+    static const websocketpp::log::level elog_level = websocketpp::log::elevel::none;
+    static const websocketpp::log::level alog_level = websocketpp::log::alevel::none;
+};
+
+struct connection_setup {
+    connection_setup(bool p_is_server) : c(p_is_server, "", alog, elog, rng) {}
+
+    websocketpp::lib::error_code ec;
+    stub_config::alog_type alog;
+    stub_config::elog_type elog;
+    stub_config::rng_type rng;
+    websocketpp::connection<stub_config> c;
+};
+
+typedef websocketpp::client<debug_config_client> debug_client;
+typedef websocketpp::server<debug_config_client> debug_server;
+
+/*void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    s->send(hdl, msg->get_payload(), msg->get_opcode());
+}*/
+
+void validate_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    s->send(hdl, msg->get_payload(), msg->get_opcode());
+}
+
+bool validate_set_ua(server* s, websocketpp::connection_hdl hdl) {
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+    con->replace_header("Server","foo");
+    return true;
+}
+
+void http_func(server* s, websocketpp::connection_hdl hdl) {
+    using namespace websocketpp::http;
+
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+
+    std::string res = con->get_resource();
+
+    con->set_body(res);
+    con->set_status(status_code::ok);
+
+    BOOST_CHECK_EQUAL(con->get_response_code(), status_code::ok);
+    BOOST_CHECK_EQUAL(con->get_response_msg(), status_code::get_string(status_code::ok));
+}
+
+void defer_http_func(server* s, bool * deferred, websocketpp::connection_hdl hdl) {
+    *deferred = true;
+    
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+    
+    websocketpp::lib::error_code ec = con->defer_http_response();
+    BOOST_CHECK_EQUAL(ec, websocketpp::lib::error_code());
+}
+
+void check_on_fail(server* s, websocketpp::lib::error_code ec, bool & called, 
+    websocketpp::connection_hdl hdl)
+{
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+
+    BOOST_CHECK_EQUAL(ec, con->get_ec());
+    called = true;
+}
+
+void on_open_print(server* s, websocketpp::connection_hdl hdl)
+{
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+
+    std::cout << con->get_uri() << std::endl;
+}
+
+void fail_on_open(websocketpp::connection_hdl) {
+    BOOST_CHECK(false);
+}
+void fail_on_http(websocketpp::connection_hdl) {
+    BOOST_CHECK(false);
+}
+
+BOOST_AUTO_TEST_CASE( connection_extensions ) {
+    connection_setup env(true);
+
+    BOOST_CHECK( env.c.extension_value == 5 );
+    BOOST_CHECK( env.c.extension_method() == 5 );
+
+    BOOST_CHECK( env.c.is_server() == true );
+}
+
+BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: ";
+    output+=websocketpp::user_agent;
+    output+="\r\nUpgrade: websocket\r\n\r\n";
+
+    server s;
+    s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+
+    BOOST_CHECK(run_server_test(s,input) == output);
+}
+
+BOOST_AUTO_TEST_CASE( http_request ) {
+    std::string input = "GET /foo/bar HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 200 OK\r\nContent-Length: 8\r\nServer: ";
+    output+=websocketpp::user_agent;
+    output+="\r\n\r\n/foo/bar";
+
+    server s;
+    s.set_http_handler(bind(&http_func,&s,::_1));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( deferred_http_request ) {
+    std::string input = "GET /foo/bar HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 200 OK\r\nContent-Length: 8\r\nServer: ";
+    output+=websocketpp::user_agent;
+    output+="\r\n\r\n/foo/bar";
+
+    server s;
+    server::connection_ptr con;
+    bool deferred = false;
+    s.set_http_handler(bind(&defer_http_func,&s, &deferred,::_1));
+
+    s.clear_access_channels(websocketpp::log::alevel::all);
+    s.clear_error_channels(websocketpp::log::elevel::all);
+    
+    std::stringstream ostream;
+    s.register_ostream(&ostream);
+
+    con = s.get_connection();
+    con->start();
+    
+    BOOST_CHECK(!deferred);
+    BOOST_CHECK_EQUAL(ostream.str(), "");
+    con->read_some(input.data(),input.size());
+    BOOST_CHECK(deferred);
+    BOOST_CHECK_EQUAL(ostream.str(), "");
+
+    con->set_body(con->get_resource());
+    con->set_status(websocketpp::http::status_code::ok);
+    
+    websocketpp::lib::error_code ec;
+    s.send_http_response(con->get_handle(),ec);
+    BOOST_CHECK_EQUAL(ec, websocketpp::lib::error_code());
+    BOOST_CHECK_EQUAL(ostream.str(), output);
+    con->send_http_response(ec);
+    BOOST_CHECK_EQUAL(ec, make_error_code(websocketpp::error::invalid_state));
+    
+}
+
+BOOST_AUTO_TEST_CASE( request_no_server_header ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nUpgrade: websocket\r\n\r\n";
+
+    server s;
+    s.set_user_agent("");
+    s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( request_no_server_header_override ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
+
+    server s;
+    s.set_user_agent("");
+    s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+    s.set_validate_handler(bind(&validate_set_ua,&s,::_1));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( basic_client_websocket ) {
+    std::string uri = "ws://localhost";
+
+    //std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
+
+    std::string ref = "GET / HTTP/1.1\r\nConnection: Upgrade\r\nFoo: Bar\r\nHost: localhost\r\nSec-WebSocket-Key: AAAAAAAAAAAAAAAAAAAAAA==\r\nSec-WebSocket-Version: 13\r\nUpgrade: websocket\r\nUser-Agent: foo\r\n\r\n";
+
+    std::stringstream output;
+
+    client e;
+    e.set_access_channels(websocketpp::log::alevel::none);
+    e.set_error_channels(websocketpp::log::elevel::none);
+    e.set_user_agent("foo");
+    e.register_ostream(&output);
+
+    client::connection_ptr con;
+    websocketpp::lib::error_code ec;
+    con = e.get_connection(uri, ec);
+    con->append_header("Foo","Bar");
+    e.connect(con);
+
+    BOOST_CHECK_EQUAL(ref, output.str());
+}
+
+BOOST_AUTO_TEST_CASE( set_max_message_size ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
+    
+    // After the handshake, add a single frame with a message that is too long.
+    char frame0[10] = {char(0x82), char(0x83), 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01};
+    input.append(frame0, 10);
+    
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
+
+    // After the handshake, add a single frame with a close message with message too big
+    // error code.
+    char frame1[4] = {char(0x88), 0x19, 0x03, char(0xf1)};
+    output.append(frame1, 4);
+    output.append("A message was too large");
+
+    server s;
+    s.set_user_agent("");
+    s.set_validate_handler(bind(&validate_set_ua,&s,::_1));
+    s.set_max_message_size(2);
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( websocket_fail_parse_error ) {
+    std::string input = "asdf\r\n\r\n";
+
+    server s;
+    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::http_parse_error);
+    bool called = false;
+    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
+
+    run_server_test(s,input,false);
+    BOOST_CHECK(called);
+}
+
+BOOST_AUTO_TEST_CASE( websocket_fail_invalid_version ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: foo\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+
+    server s;
+    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::invalid_version);
+    bool called = false;
+    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
+
+    run_server_test(s,input,false);
+    BOOST_CHECK(called);
+}
+
+BOOST_AUTO_TEST_CASE( websocket_fail_unsupported_version ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 12\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+
+    server s;
+    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
+    bool called = false;
+    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
+
+    run_server_test(s,input,false);
+    BOOST_CHECK(called);
+}
+
+// BOOST_AUTO_TEST_CASE( websocket_fail_invalid_uri ) {
+//     std::string input = "GET http://345.123.123.123/foo HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+
+//     server s;
+//     websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
+//     bool called = false;
+//     s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
+//     s.set_open_handler(bind(&on_open_print,&s,::_1));
+
+//     std::cout << run_server_test(s,input,true) << std::endl;
+//     BOOST_CHECK(called);
+// }
+
+// BOOST_AUTO_TEST_CASE( websocket_fail_invalid_uri_http ) {
+//     std::string input = "GET http://345.123.123.123/foo HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
+
+//     server s;
+//     websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
+//     bool called = false;
+//     s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
+//     s.set_open_handler(bind(&on_open_print,&s,::_1));
+
+//     std::cout << run_server_test(s,input,true) << std::endl;
+//     BOOST_CHECK(called);
+// }
+
+BOOST_AUTO_TEST_CASE( websocket_fail_upgrade_required ) {
+    std::string input = "GET /foo/bar HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
+
+    server s;
+    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::upgrade_required);
+    bool called = false;
+    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
+
+    run_server_test(s,input,false);
+    BOOST_CHECK(called);
+}
+
+// TODO: set max message size in client endpoint test case
+// TODO: set max message size mid connection test case
+// TODO: [maybe] set max message size in open handler
+
+
+
+// BOOST_AUTO_TEST_CASE( user_reject_origin ) {
+//     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example2.com\r\n\r\n";
+//     std::string output = "HTTP/1.1 403 Forbidden\r\nServer: "+websocketpp::USER_AGENT+"\r\n\r\n";
+
+//     BOOST_CHECK(run_server_test(input) == output);
+// }
+
+// BOOST_AUTO_TEST_CASE( basic_text_message ) {
+//     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+
+//     unsigned char frames[8] = {0x82,0x82,0xFF,0xFF,0xFF,0xFF,0xD5,0xD5};
+//     input.append(reinterpret_cast<char*>(frames),8);
+
+//     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: "+websocketpp::USER_AGENT+"\r\nUpgrade: websocket\r\n\r\n**";
+
+//     BOOST_CHECK( run_server_test(input) == output);
+// }
+
+
+
+
+
+
+BOOST_AUTO_TEST_CASE( client_handshake_timeout_race1 ) {
+    debug_client c;
+
+    websocketpp::lib::error_code ec;
+    debug_client::connection_ptr con = c.get_connection("ws://localhost:9002", ec);
+
+    BOOST_CHECK(!ec);
+
+    // This test the case where a handshake times out immediately before the 
+    // handler that would have completed it gets invoked. This situation happens
+    // when clients are connecting to overloaded servers and on servers that are
+    // overloaded. 
+    c.connect(con);
+    
+    con->expire_timer(websocketpp::lib::error_code());
+    // Fullfil the write to simulate the write completing immediately after
+    // timer expires
+    con->fullfil_write();
+    
+    BOOST_CHECK_EQUAL(con->get_ec(), make_error_code(websocketpp::error::open_handshake_timeout));
+}
+
+BOOST_AUTO_TEST_CASE( client_handshake_timeout_race2 ) {
+    debug_client c;
+
+    websocketpp::lib::error_code ec;
+    debug_client::connection_ptr con = c.get_connection("ws://localhost:9002", ec);
+
+    BOOST_CHECK(!ec);
+
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: ICX+Yqv66kxgM0FcWaLWlFLwTAI=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
+
+    // This test the case where a handshake times out immediately before the 
+    // handler that would have completed it gets invoked. This situation happens
+    // when clients are connecting to overloaded servers and on servers that are
+    // overloaded. 
+    c.connect(con);
+    con->fullfil_write();
+    
+    con->expire_timer(websocketpp::lib::error_code());
+    // Read valid handshake to simulate receiving the handshake response
+    // immediately after the timer expires
+    con->read_all(output.data(),output.size());
+    
+    BOOST_CHECK_EQUAL(con->get_ec(), make_error_code(websocketpp::error::open_handshake_timeout));
+}
+
+BOOST_AUTO_TEST_CASE( server_handshake_timeout_race1 ) {
+    debug_server s;
+
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: AAAAAAAAAAAAAAAAAAAAAA==\r\n\r\n";
+
+    debug_server::connection_ptr con = s.get_connection();
+    con->start();
+    
+    con->expire_timer(websocketpp::lib::error_code());
+    // Read handshake immediately after timer expire
+    con->read_all(input.data(), input.size());
+    
+    BOOST_CHECK_EQUAL(con->get_ec(), make_error_code(websocketpp::error::open_handshake_timeout));
+}
+
+BOOST_AUTO_TEST_CASE( server_handshake_timeout_race2 ) {
+    debug_server s;
+
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: AAAAAAAAAAAAAAAAAAAAAA==\r\n\r\n";
+
+    debug_server::connection_ptr con = s.get_connection();
+    con->start();
+    
+    con->read_all(input.data(), input.size());
+    
+    con->expire_timer(websocketpp::lib::error_code());
+    // Complete write immediately after timer expire
+    con->fullfil_write();
+    
+    BOOST_CHECK_EQUAL(con->get_ec(), make_error_code(websocketpp::error::open_handshake_timeout));
+}
+
+
diff --git a/vendor/websocketpp/test/connection/connection_tu2.cpp b/vendor/websocketpp/test/connection/connection_tu2.cpp
new file mode 100644
index 0000000..5409624
--- /dev/null
+++ b/vendor/websocketpp/test/connection/connection_tu2.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include "connection_tu2.hpp"
+
+void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    s->send(hdl, msg->get_payload(), msg->get_opcode());
+}
+
+std::string run_server_test(std::string input, bool log) {
+    server test_server;
+    return run_server_test(test_server,input,log);
+}
+
+std::string run_server_test(server & s, std::string input, bool log) {
+    server::connection_ptr con;
+    std::stringstream output;
+
+    if (log) {
+        s.set_access_channels(websocketpp::log::alevel::all);
+        s.set_error_channels(websocketpp::log::elevel::all);
+    } else {
+        s.clear_access_channels(websocketpp::log::alevel::all);
+        s.clear_error_channels(websocketpp::log::elevel::all);
+    }
+
+    s.register_ostream(&output);
+
+    con = s.get_connection();
+    con->start();
+
+    std::stringstream channel;
+
+    channel << input;
+    channel >> *con;
+
+    return output.str();
+}
diff --git a/vendor/websocketpp/test/connection/connection_tu2.hpp b/vendor/websocketpp/test/connection/connection_tu2.hpp
new file mode 100644
index 0000000..8990ce0
--- /dev/null
+++ b/vendor/websocketpp/test/connection/connection_tu2.hpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <iostream>
+#include <sstream>
+
+// Test Environment:
+// server, no TLS, no locks, iostream based transport
+#include <websocketpp/config/debug.hpp>
+#include <websocketpp/config/core.hpp>
+#include <websocketpp/server.hpp>
+#include <websocketpp/client.hpp>
+
+typedef websocketpp::server<websocketpp::config::core> server;
+/// NOTE: the "server" config is being used for the client here because we don't
+/// want to pull in the real RNG. A better way to do this might be a custom
+/// client config with the RNG explicitly stubbed out.
+typedef websocketpp::client<websocketpp::config::core> client;
+typedef websocketpp::config::core::message_type::ptr message_ptr;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg);
+std::string run_server_test(std::string input, bool log = false);
+std::string run_server_test(server & s, std::string input, bool log = false);
diff --git a/vendor/websocketpp/test/endpoint/CMakeLists.txt b/vendor/websocketpp/test/endpoint/CMakeLists.txt
new file mode 100644
index 0000000..1b25353
--- /dev/null
+++ b/vendor/websocketpp/test/endpoint/CMakeLists.txt
@@ -0,0 +1,17 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+if (OPENSSL_FOUND)
+
+init_target (test_endpoint)
+
+build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+link_openssl ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+endif()
\ No newline at end of file
diff --git a/vendor/websocketpp/test/endpoint/SConscript b/vendor/websocketpp/test/endpoint/SConscript
new file mode 100644
index 0000000..5cb3ede
--- /dev/null
+++ b/vendor/websocketpp/test/endpoint/SConscript
@@ -0,0 +1,24 @@
+## endpoint unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + [tls_libs]
+
+objs = env.Object('endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_endpoint_boost', ["endpoint_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   objs += env_cpp11.Object('endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_endpoint_stl', ["endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/endpoint/endpoint.cpp b/vendor/websocketpp/test/endpoint/endpoint.cpp
new file mode 100644
index 0000000..34764d1
--- /dev/null
+++ b/vendor/websocketpp/test/endpoint/endpoint.cpp
@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE endpoint
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <sstream>
+
+#include <websocketpp/config/asio.hpp>
+#include <websocketpp/server.hpp>
+
+BOOST_AUTO_TEST_CASE( construct_server_iostream ) {
+    websocketpp::server<websocketpp::config::core> s;
+}
+
+BOOST_AUTO_TEST_CASE( construct_server_asio_plain ) {
+    websocketpp::server<websocketpp::config::asio> s;
+}
+
+BOOST_AUTO_TEST_CASE( construct_server_asio_tls ) {
+    websocketpp::server<websocketpp::config::asio_tls> s;
+}
+
+BOOST_AUTO_TEST_CASE( initialize_server_asio ) {
+    websocketpp::server<websocketpp::config::asio> s;
+    s.init_asio();
+}
+
+BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) {
+    websocketpp::server<websocketpp::config::asio> s;
+    boost::asio::io_service ios;
+    s.init_asio(&ios);
+}
+
+#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+BOOST_AUTO_TEST_CASE( move_construct_server_core ) {
+    websocketpp::server<websocketpp::config::core> s1;
+    
+    websocketpp::server<websocketpp::config::core> s2(std::move(s1));
+}
+
+/*
+// temporary disable because library doesn't pass
+BOOST_AUTO_TEST_CASE( emplace ) {
+    std::stringstream out1;
+    std::stringstream out2;
+    
+    std::vector<websocketpp::server<websocketpp::config::asio_tls>> v;
+    
+    v.emplace_back();
+    v.emplace_back();
+    
+    v[0].get_alog().set_ostream(&out1);
+    v[0].get_alog().set_ostream(&out2);
+    
+    v[0].get_alog().write(websocketpp::log::alevel::app,"devel0");
+    v[1].get_alog().write(websocketpp::log::alevel::app,"devel1");
+    BOOST_CHECK( out1.str().size() > 0 );
+    BOOST_CHECK( out2.str().size() > 0 );
+}*/
+
+#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
+
+struct endpoint_extension {
+    endpoint_extension() : extension_value(5) {}
+
+    int extension_method() {
+        return extension_value;
+    }
+
+    bool is_server() const {
+        return false;
+    }
+
+    int extension_value;
+};
+
+struct stub_config : public websocketpp::config::core {
+    typedef core::concurrency_type concurrency_type;
+
+    typedef core::request_type request_type;
+    typedef core::response_type response_type;
+
+    typedef core::message_type message_type;
+    typedef core::con_msg_manager_type con_msg_manager_type;
+    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef core::alog_type alog_type;
+    typedef core::elog_type elog_type;
+
+    typedef core::rng_type rng_type;
+
+    typedef core::transport_type transport_type;
+
+    typedef endpoint_extension endpoint_base;
+};
+
+BOOST_AUTO_TEST_CASE( endpoint_extensions ) {
+    websocketpp::server<stub_config> s;
+
+    BOOST_CHECK_EQUAL( s.extension_value, 5 );
+    BOOST_CHECK_EQUAL( s.extension_method(), 5 );
+
+    BOOST_CHECK( s.is_server() );
+}
+
+BOOST_AUTO_TEST_CASE( listen_after_listen_failure ) {
+    using websocketpp::transport::asio::error::make_error_code;
+    using websocketpp::transport::asio::error::pass_through;
+
+    websocketpp::server<websocketpp::config::asio> server1;
+    websocketpp::server<websocketpp::config::asio> server2;
+
+    websocketpp::lib::error_code ec;
+
+    server1.init_asio();
+    server2.init_asio();
+
+    boost::asio::ip::tcp::endpoint ep1(boost::asio::ip::address::from_string("127.0.0.1"), 12345);
+    boost::asio::ip::tcp::endpoint ep2(boost::asio::ip::address::from_string("127.0.0.1"), 23456);
+
+    server1.listen(ep1, ec);
+    BOOST_CHECK(!ec);
+
+    server2.listen(ep1, ec);
+    BOOST_REQUIRE_EQUAL(ec, make_error_code(pass_through));
+
+    server2.listen(ep2, ec);
+    BOOST_CHECK(!ec);
+}
diff --git a/vendor/websocketpp/test/extension/CMakeLists.txt b/vendor/websocketpp/test/extension/CMakeLists.txt
new file mode 100644
index 0000000..9cb8f8a
--- /dev/null
+++ b/vendor/websocketpp/test/extension/CMakeLists.txt
@@ -0,0 +1,22 @@
+# Extension Tests
+file (GLOB SOURCE extension.cpp)
+
+init_target (test_extension)
+build_executable (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+if ( ZLIB_FOUND )
+
+# Permessage-deflate tests
+file (GLOB SOURCE permessage_deflate.cpp)
+
+init_target (test_permessage_deflate)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+link_zlib()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+endif ( ZLIB_FOUND )
\ No newline at end of file
diff --git a/vendor/websocketpp/test/extension/SConscript b/vendor/websocketpp/test/extension/SConscript
new file mode 100644
index 0000000..d8b425f
--- /dev/null
+++ b/vendor/websocketpp/test/extension/SConscript
@@ -0,0 +1,27 @@
+## http unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + ['z']
+
+objs = env.Object('extension_boost.o', ["extension.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('permessage_deflate_boost.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_extension_boost', ["extension_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_permessage_deflate_boost', ["permessage_deflate_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
+   objs += env_cpp11.Object('extension_stl.o', ["extension.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('permessage_deflate_stl.o', ["permessage_deflate.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_extension_stl', ["extension_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_permessage_deflate_stl', ["permessage_deflate_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/extension/extension.cpp b/vendor/websocketpp/test/extension/extension.cpp
new file mode 100644
index 0000000..5439c07
--- /dev/null
+++ b/vendor/websocketpp/test/extension/extension.cpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE extension
+#include <boost/test/unit_test.hpp>
+
+#include <string>
+
+#include <websocketpp/extensions/extension.hpp>
+
+BOOST_AUTO_TEST_CASE( blank ) {
+    BOOST_CHECK( true );
+}
diff --git a/vendor/websocketpp/test/extension/permessage_deflate.cpp b/vendor/websocketpp/test/extension/permessage_deflate.cpp
new file mode 100644
index 0000000..4cd3e7b
--- /dev/null
+++ b/vendor/websocketpp/test/extension/permessage_deflate.cpp
@@ -0,0 +1,649 @@
+/*
+ * Copyright (c) 2013, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE permessage_deflate
+#include <boost/test/unit_test.hpp>
+
+#include <websocketpp/error.hpp>
+
+#include <websocketpp/extensions/extension.hpp>
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+#include <string>
+
+#include <websocketpp/utilities.hpp>
+#include <iostream>
+
+class config {};
+
+typedef websocketpp::extensions::permessage_deflate::enabled<config> enabled_type;
+typedef websocketpp::extensions::permessage_deflate::disabled<config> disabled_type;
+
+struct ext_vars {
+    enabled_type exts;
+    enabled_type extc;
+    websocketpp::lib::error_code ec;
+    websocketpp::err_str_pair esp;
+    websocketpp::http::attribute_list attr;
+};
+namespace pmde = websocketpp::extensions::permessage_deflate::error;
+namespace pmd_mode = websocketpp::extensions::permessage_deflate::mode;
+
+// Ensure the disabled extension behaves appropriately disabled
+
+BOOST_AUTO_TEST_CASE( disabled_is_disabled ) {
+    disabled_type exts;
+    BOOST_CHECK( !exts.is_implemented() );
+}
+
+BOOST_AUTO_TEST_CASE( disabled_is_off ) {
+    disabled_type exts;
+    BOOST_CHECK( !exts.is_enabled() );
+}
+
+// Ensure the enabled version actually works
+
+BOOST_AUTO_TEST_CASE( enabled_is_enabled ) {
+    ext_vars v;
+    BOOST_CHECK( v.exts.is_implemented() );
+    BOOST_CHECK( v.extc.is_implemented() );
+}
+
+
+BOOST_AUTO_TEST_CASE( enabled_starts_disabled ) {
+    ext_vars v;
+    BOOST_CHECK( !v.exts.is_enabled() );
+    BOOST_CHECK( !v.extc.is_enabled() );
+}
+
+BOOST_AUTO_TEST_CASE( negotiation_empty_attr ) {
+    ext_vars v;
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( negotiation_invalid_attr ) {
+    ext_vars v;
+    v.attr["foo"] = "bar";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( !v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attributes) );
+    BOOST_CHECK_EQUAL( v.esp.second, "");
+}
+
+// Negotiate server_no_context_takeover
+BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover_invalid ) {
+    ext_vars v;
+    v.attr["server_no_context_takeover"] = "foo";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( !v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
+    BOOST_CHECK_EQUAL( v.esp.second, "");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover ) {
+    ext_vars v;
+    v.attr["server_no_context_takeover"].clear();
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover_server_initiated ) {
+    ext_vars v;
+
+    v.exts.enable_server_no_context_takeover();
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover");
+}
+
+// Negotiate client_no_context_takeover
+BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover_invalid ) {
+    ext_vars v;
+    v.attr["client_no_context_takeover"] = "foo";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( !v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
+    BOOST_CHECK_EQUAL( v.esp.second, "");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover ) {
+    ext_vars v;
+    v.attr["client_no_context_takeover"].clear();
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover_server_initiated ) {
+    ext_vars v;
+
+    v.exts.enable_client_no_context_takeover();
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover");
+}
+
+
+// Negotiate server_max_window_bits
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) {
+    ext_vars v;
+
+    std::vector<std::string> values;
+    values.push_back("");
+    values.push_back("foo");
+    values.push_back("7");
+    values.push_back("16");
+
+    std::vector<std::string>::const_iterator it;
+    for (it = values.begin(); it != values.end(); ++it) {
+        v.attr["server_max_window_bits"] = *it;
+
+        v.esp = v.exts.negotiate(v.attr);
+        BOOST_CHECK( !v.exts.is_enabled() );
+        BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
+        BOOST_CHECK_EQUAL( v.esp.second, "");
+    }
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_valid ) {
+    ext_vars v;
+    v.attr["server_max_window_bits"] = "8";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8");
+
+    v.attr["server_max_window_bits"] = "15";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( invalid_set_server_max_window_bits ) {
+    ext_vars v;
+
+    v.ec = v.exts.set_server_max_window_bits(7,pmd_mode::decline);
+    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
+
+    v.ec = v.exts.set_server_max_window_bits(16,pmd_mode::decline);
+    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) {
+    ext_vars v;
+    v.attr["server_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::decline);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) {
+    ext_vars v;
+    v.attr["server_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::accept);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) {
+    ext_vars v;
+    v.attr["server_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::largest);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) {
+    ext_vars v;
+    v.attr["server_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::smallest);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8");
+}
+
+// Negotiate server_max_window_bits
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_invalid ) {
+    ext_vars v;
+
+    std::vector<std::string> values;
+    values.push_back("foo");
+    values.push_back("7");
+    values.push_back("16");
+
+    std::vector<std::string>::const_iterator it;
+    for (it = values.begin(); it != values.end(); ++it) {
+        v.attr["client_max_window_bits"] = *it;
+
+        v.esp = v.exts.negotiate(v.attr);
+        BOOST_CHECK( !v.exts.is_enabled() );
+        BOOST_CHECK_EQUAL( v.esp.first, pmde::make_error_code(pmde::invalid_attribute_value) );
+        BOOST_CHECK_EQUAL( v.esp.second, "");
+    }
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_valid ) {
+    ext_vars v;
+
+    v.attr["client_max_window_bits"].clear();
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+
+    v.attr["client_max_window_bits"] = "8";
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8");
+
+    v.attr["client_max_window_bits"] = "15";
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( invalid_set_client_max_window_bits ) {
+    ext_vars v;
+
+    v.ec = v.exts.set_client_max_window_bits(7,pmd_mode::decline);
+    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
+
+    v.ec = v.exts.set_client_max_window_bits(16,pmd_mode::decline);
+    BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) {
+    ext_vars v;
+    v.attr["client_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_client_max_window_bits(8,pmd_mode::decline);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) {
+    ext_vars v;
+    v.attr["client_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::accept);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) {
+    ext_vars v;
+    v.attr["client_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::largest);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) {
+    ext_vars v;
+    v.attr["client_max_window_bits"] = "8";
+
+    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::smallest);
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8");
+}
+
+
+// Combinations with 2
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated1 ) {
+    ext_vars v;
+
+    v.attr["server_no_context_takeover"].clear();
+    v.attr["client_no_context_takeover"].clear();
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated2 ) {
+    ext_vars v;
+
+    v.attr["server_no_context_takeover"].clear();
+    v.attr["server_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; server_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated3 ) {
+    ext_vars v;
+
+    v.attr["server_no_context_takeover"].clear();
+    v.attr["client_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated4 ) {
+    ext_vars v;
+
+    v.attr["client_no_context_takeover"].clear();
+    v.attr["server_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; server_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated5 ) {
+    ext_vars v;
+
+    v.attr["client_no_context_takeover"].clear();
+    v.attr["client_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; client_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated6 ) {
+    ext_vars v;
+
+    v.attr["server_max_window_bits"] = "10";
+    v.attr["client_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=10; client_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated1 ) {
+    ext_vars v;
+
+    v.attr["server_no_context_takeover"].clear();
+    v.attr["client_no_context_takeover"].clear();
+    v.attr["server_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; server_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated2 ) {
+    ext_vars v;
+
+    v.attr["server_no_context_takeover"].clear();
+    v.attr["client_no_context_takeover"].clear();
+    v.attr["client_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; client_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated3 ) {
+    ext_vars v;
+
+    v.attr["server_no_context_takeover"].clear();
+    v.attr["server_max_window_bits"] = "10";
+    v.attr["client_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated4 ) {
+    ext_vars v;
+
+    v.attr["client_no_context_takeover"].clear();
+    v.attr["server_max_window_bits"] = "10";
+    v.attr["client_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
+}
+
+BOOST_AUTO_TEST_CASE( negotiate_four_client_initiated ) {
+    ext_vars v;
+
+    v.attr["server_no_context_takeover"].clear();
+    v.attr["client_no_context_takeover"].clear();
+    v.attr["server_max_window_bits"] = "10";
+    v.attr["client_max_window_bits"] = "10";
+
+    v.esp = v.exts.negotiate(v.attr);
+    BOOST_CHECK( v.exts.is_enabled() );
+    BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
+}
+
+// Compression
+BOOST_AUTO_TEST_CASE( compress_data ) {
+    ext_vars v;
+
+    std::string compress_in = "Hello";
+    std::string compress_out;
+    std::string decompress_out;
+
+    v.exts.init(true);
+
+    v.ec = v.exts.compress(compress_in,compress_out);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+
+    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( compress_in, decompress_out );
+}
+
+BOOST_AUTO_TEST_CASE( compress_data_multiple ) {
+    ext_vars v;
+
+    v.exts.init(true);
+
+    for (int i = 0; i < 2; i++) {
+        std::string compress_in = "Hello";
+        std::string compress_out;
+        std::string decompress_out;
+
+        v.ec = v.exts.compress(compress_in,compress_out);
+        BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+
+        v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
+        BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+        BOOST_CHECK_EQUAL( compress_in, decompress_out );
+    }
+}
+
+BOOST_AUTO_TEST_CASE( compress_data_large ) {
+    ext_vars v;
+
+    std::string compress_in(600,'*');
+    std::string compress_out;
+    std::string decompress_out;
+
+    websocketpp::http::attribute_list alist;
+
+    alist["server_max_window_bits"] = "8";
+    v.exts.set_server_max_window_bits(8,websocketpp::extensions::permessage_deflate::mode::smallest);
+
+    v.exts.negotiate(alist);
+    v.exts.init(true);
+
+    v.ec = v.exts.compress(compress_in,compress_out);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+
+    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( compress_in, decompress_out );
+}
+
+BOOST_AUTO_TEST_CASE( compress_data_no_context_takeover ) {
+    ext_vars v;
+
+    std::string compress_in = "Hello";
+    std::string compress_out1;
+    std::string compress_out2;
+    std::string decompress_out;
+
+    websocketpp::http::attribute_list alist;
+
+    alist["server_no_context_takeover"].clear();
+    v.exts.enable_server_no_context_takeover();
+
+    v.exts.negotiate(alist);
+    v.exts.init(true);
+
+    v.ec = v.exts.compress(compress_in,compress_out1);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+
+    v.ec = v.exts.decompress(
+        reinterpret_cast<const uint8_t *>(compress_out1.data()),
+        compress_out1.size(),
+        decompress_out
+    );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( compress_in, decompress_out );
+
+    decompress_out.clear();
+
+    v.ec = v.exts.compress(compress_in,compress_out2);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+
+    v.ec = v.exts.decompress(
+        reinterpret_cast<const uint8_t *>(compress_out2.data()),
+        compress_out2.size(),
+        decompress_out
+    );
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( compress_in, decompress_out );
+
+    BOOST_CHECK_EQUAL( compress_out1, compress_out2 );
+}
+
+BOOST_AUTO_TEST_CASE( compress_empty ) {
+    ext_vars v;
+
+    std::string compress_in;
+    std::string compress_out;
+    std::string decompress_out;
+
+    v.exts.init(true);
+
+    v.ec = v.exts.compress(compress_in,compress_out);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+
+    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
+
+    compress_out.clear();
+    decompress_out.clear();
+
+    v.ec = v.exts.compress(compress_in,compress_out);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+
+    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( compress_in, decompress_out );
+}
+
+/// @todo: more compression tests
+/**
+ * - compress at different compression levels
+ */
+
+// Decompression
+BOOST_AUTO_TEST_CASE( decompress_data ) {
+    ext_vars v;
+
+    uint8_t in[11] = {0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00, 0x00, 0x00, 0xff, 0xff};
+    std::string out;
+    std::string reference = "Hello";
+
+    v.exts.init(true);
+
+    v.ec = v.exts.decompress(in,11,out);
+
+    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    BOOST_CHECK_EQUAL( out, reference );
+}
diff --git a/vendor/websocketpp/test/http/CMakeLists.txt b/vendor/websocketpp/test/http/CMakeLists.txt
new file mode 100644
index 0000000..e005477
--- /dev/null
+++ b/vendor/websocketpp/test/http/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+file (GLOB SOURCE_FILES parser.cpp)
+
+init_target (test_http)
+
+build_test (${TARGET_NAME} ${SOURCE_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/vendor/websocketpp/test/http/SConscript b/vendor/websocketpp/test/http/SConscript
new file mode 100644
index 0000000..0a24a87
--- /dev/null
+++ b/vendor/websocketpp/test/http/SConscript
@@ -0,0 +1,23 @@
+## http unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework'],env) + [platform_libs]
+
+objs = env.Object('parser_boost.o', ["parser.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_http_boost', ["parser_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   objs += env_cpp11.Object('parser_stl.o', ["parser.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_http_stl', ["parser_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/http/parser.cpp b/vendor/websocketpp/test/http/parser.cpp
new file mode 100644
index 0000000..1d71ec8
--- /dev/null
+++ b/vendor/websocketpp/test/http/parser.cpp
@@ -0,0 +1,1129 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE http_parser
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+
+BOOST_AUTO_TEST_CASE( is_token_char ) {
+    // Valid characters
+
+    // misc
+    BOOST_CHECK( websocketpp::http::is_token_char('!') );
+    BOOST_CHECK( websocketpp::http::is_token_char('#') );
+    BOOST_CHECK( websocketpp::http::is_token_char('$') );
+    BOOST_CHECK( websocketpp::http::is_token_char('%') );
+    BOOST_CHECK( websocketpp::http::is_token_char('&') );
+    BOOST_CHECK( websocketpp::http::is_token_char('\'') );
+    BOOST_CHECK( websocketpp::http::is_token_char('*') );
+    BOOST_CHECK( websocketpp::http::is_token_char('+') );
+    BOOST_CHECK( websocketpp::http::is_token_char('-') );
+    BOOST_CHECK( websocketpp::http::is_token_char('.') );
+    BOOST_CHECK( websocketpp::http::is_token_char('^') );
+    BOOST_CHECK( websocketpp::http::is_token_char('_') );
+    BOOST_CHECK( websocketpp::http::is_token_char('`') );
+    BOOST_CHECK( websocketpp::http::is_token_char('~') );
+
+    // numbers
+    for (int i = 0x30; i < 0x3a; i++) {
+        BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
+    }
+
+    // upper
+    for (int i = 0x41; i < 0x5b; i++) {
+        BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
+    }
+
+    // lower
+    for (int i = 0x61; i < 0x7b; i++) {
+        BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(i)) );
+    }
+
+    // invalid characters
+
+    // lower unprintable
+    for (int i = 0; i < 33; i++) {
+        BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
+    }
+
+    // misc
+    BOOST_CHECK( !websocketpp::http::is_token_char('(') );
+    BOOST_CHECK( !websocketpp::http::is_token_char(')') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('<') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('>') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('@') );
+    BOOST_CHECK( !websocketpp::http::is_token_char(',') );
+    BOOST_CHECK( !websocketpp::http::is_token_char(';') );
+    BOOST_CHECK( !websocketpp::http::is_token_char(':') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('\\') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('"') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('/') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('[') );
+    BOOST_CHECK( !websocketpp::http::is_token_char(']') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('?') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('=') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('{') );
+    BOOST_CHECK( !websocketpp::http::is_token_char('}') );
+
+    // upper unprintable and out of ascii range
+    for (int i = 127; i < 256; i++) {
+        BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
+    }
+
+    // is not
+    BOOST_CHECK( !websocketpp::http::is_not_token_char('!') );
+    BOOST_CHECK( websocketpp::http::is_not_token_char('(') );
+}
+
+BOOST_AUTO_TEST_CASE( extract_token ) {
+    std::string d1 = "foo";
+    std::string d2 = " foo ";
+
+    std::pair<std::string,std::string::const_iterator> ret;
+
+    ret = websocketpp::http::parser::extract_token(d1.begin(),d1.end());
+    BOOST_CHECK( ret.first == "foo" );
+    BOOST_CHECK( ret.second == d1.begin()+3 );
+
+    ret = websocketpp::http::parser::extract_token(d2.begin(),d2.end());
+    BOOST_CHECK( ret.first.empty() );
+    BOOST_CHECK( ret.second == d2.begin()+0 );
+
+    ret = websocketpp::http::parser::extract_token(d2.begin()+1,d2.end());
+    BOOST_CHECK( ret.first == "foo" );
+    BOOST_CHECK( ret.second == d2.begin()+4 );
+}
+
+BOOST_AUTO_TEST_CASE( extract_quoted_string ) {
+    std::string d1 = "\"foo\"";
+    std::string d2 = "\"foo\\\"bar\\\"baz\"";
+    std::string d3 = "\"foo\"     ";
+    std::string d4;
+    std::string d5 = "foo";
+
+    std::pair<std::string,std::string::const_iterator> ret;
+
+    using websocketpp::http::parser::extract_quoted_string;
+
+    ret = extract_quoted_string(d1.begin(),d1.end());
+    BOOST_CHECK( ret.first == "foo" );
+    BOOST_CHECK( ret.second == d1.end() );
+
+    ret = extract_quoted_string(d2.begin(),d2.end());
+    BOOST_CHECK( ret.first == "foo\"bar\"baz" );
+    BOOST_CHECK( ret.second == d2.end() );
+
+    ret = extract_quoted_string(d3.begin(),d3.end());
+    BOOST_CHECK( ret.first == "foo" );
+    BOOST_CHECK( ret.second == d3.begin()+5 );
+
+    ret = extract_quoted_string(d4.begin(),d4.end());
+    BOOST_CHECK( ret.first.empty() );
+    BOOST_CHECK( ret.second == d4.begin() );
+
+    ret = extract_quoted_string(d5.begin(),d5.end());
+    BOOST_CHECK( ret.first.empty() );
+    BOOST_CHECK( ret.second == d5.begin() );
+}
+
+BOOST_AUTO_TEST_CASE( extract_all_lws ) {
+    std::string d1 = " foo     bar";
+    d1.append(1,char(9));
+    d1.append("baz\r\n d\r\n  \r\n  e\r\nf");
+
+    std::string::const_iterator ret;
+
+    ret = websocketpp::http::parser::extract_all_lws(d1.begin(),d1.end());
+    BOOST_CHECK( ret == d1.begin()+1 );
+
+    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+1,d1.end());
+    BOOST_CHECK( ret == d1.begin()+1 );
+
+    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+4,d1.end());
+    BOOST_CHECK( ret == d1.begin()+9 );
+
+    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+12,d1.end());
+    BOOST_CHECK( ret == d1.begin()+13 );
+
+    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+16,d1.end());
+    BOOST_CHECK( ret == d1.begin()+19 );
+
+    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+20,d1.end());
+    BOOST_CHECK( ret == d1.begin()+28 );
+
+    ret = websocketpp::http::parser::extract_all_lws(d1.begin()+29,d1.end());
+    BOOST_CHECK( ret == d1.begin()+29 );
+}
+
+BOOST_AUTO_TEST_CASE( extract_attributes_blank ) {
+    std::string s;
+
+    websocketpp::http::attribute_list a;
+    std::string::const_iterator it;
+
+    it = websocketpp::http::parser::extract_attributes(s.begin(),s.end(),a);
+    BOOST_CHECK( it == s.begin() );
+    BOOST_CHECK_EQUAL( a.size(), 0 );
+}
+
+BOOST_AUTO_TEST_CASE( extract_attributes_simple ) {
+    std::string s = "foo";
+
+    websocketpp::http::attribute_list a;
+    std::string::const_iterator it;
+
+    it = websocketpp::http::parser::extract_attributes(s.begin(),s.end(),a);
+    BOOST_CHECK( it == s.end() );
+    BOOST_CHECK_EQUAL( a.size(), 1 );
+    BOOST_CHECK( a.find("foo") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("foo")->second, "" );
+}
+
+BOOST_AUTO_TEST_CASE( extract_parameters ) {
+    std::string s1;
+    std::string s2 = "foo";
+    std::string s3 = " foo \r\nAbc";
+    std::string s4 = "  \r\n   foo  ";
+    std::string s5 = "foo,bar";
+    std::string s6 = "foo;bar";
+    std::string s7 = "foo;baz,bar";
+    std::string s8 = "foo;bar;baz";
+    std::string s9 = "foo;bar=baz";
+    std::string s10 = "foo;bar=baz;boo";
+    std::string s11 = "foo;bar=baz;boo,bob";
+    std::string s12 = "foo;bar=\"a b c\"";
+    std::string s13 = "foo;bar=\"a \\\"b\\\" c\"";
+
+
+    std::string sx = "foo;bar=\"a \\\"b\\\" c\"";
+    websocketpp::http::parameter_list p;
+    websocketpp::http::attribute_list a;
+    std::string::const_iterator it;
+
+    using websocketpp::http::parser::extract_parameters;
+
+    it = extract_parameters(s1.begin(),s1.end(),p);
+    BOOST_CHECK( it == s1.begin() );
+
+    p.clear();
+    it = extract_parameters(s2.begin(),s2.end(),p);
+    BOOST_CHECK( it == s2.end() );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
+
+    p.clear();
+    it = extract_parameters(s3.begin(),s3.end(),p);
+    BOOST_CHECK( it == s3.begin()+5 );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
+
+    p.clear();
+    it = extract_parameters(s4.begin(),s4.end(),p);
+    BOOST_CHECK( it == s4.end() );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
+
+    p.clear();
+    it = extract_parameters(s5.begin(),s5.end(),p);
+    BOOST_CHECK( it == s5.end() );
+    BOOST_CHECK_EQUAL( p.size(), 2 );
+    BOOST_CHECK( p[0].first == "foo" );
+    BOOST_CHECK_EQUAL( p[0].second.size(), 0 );
+    BOOST_CHECK( p[1].first == "bar" );
+    BOOST_CHECK_EQUAL( p[1].second.size(), 0 );
+
+    p.clear();
+    it = extract_parameters(s6.begin(),s6.end(),p);
+    BOOST_CHECK( it == s6.end() );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    a = p[0].second;
+    BOOST_CHECK_EQUAL( a.size(), 1 );
+    BOOST_CHECK( a.find("bar") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("bar")->second, "" );
+
+    p.clear();
+    it = extract_parameters(s7.begin(),s7.end(),p);
+    BOOST_CHECK( it == s7.end() );
+    BOOST_CHECK_EQUAL( p.size(), 2 );
+    BOOST_CHECK( p[0].first == "foo" );
+    a = p[0].second;
+    BOOST_CHECK_EQUAL( a.size(), 1 );
+    BOOST_CHECK( a.find("baz") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("baz")->second, "" );
+    BOOST_CHECK( p[1].first == "bar" );
+    a = p[1].second;
+    BOOST_CHECK_EQUAL( a.size(), 0 );
+
+    p.clear();
+    it = extract_parameters(s8.begin(),s8.end(),p);
+    BOOST_CHECK( it == s8.end() );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    a = p[0].second;
+    BOOST_CHECK_EQUAL( a.size(), 2 );
+    BOOST_CHECK( a.find("bar") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("bar")->second, "" );
+    BOOST_CHECK( a.find("baz") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("baz")->second, "" );
+
+    p.clear();
+    it = extract_parameters(s9.begin(),s9.end(),p);
+    BOOST_CHECK( it == s9.end() );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    a = p[0].second;
+    BOOST_CHECK_EQUAL( a.size(), 1 );
+    BOOST_CHECK( a.find("bar") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
+
+    p.clear();
+    it = extract_parameters(s10.begin(),s10.end(),p);
+    BOOST_CHECK( it == s10.end() );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    a = p[0].second;
+    BOOST_CHECK_EQUAL( a.size(), 2 );
+    BOOST_CHECK( a.find("bar") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
+    BOOST_CHECK( a.find("boo") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("boo")->second, "" );
+
+    p.clear();
+    it = extract_parameters(s11.begin(),s11.end(),p);
+    BOOST_CHECK( it == s11.end() );
+    BOOST_CHECK_EQUAL( p.size(), 2 );
+    BOOST_CHECK( p[0].first == "foo" );
+    a = p[0].second;
+    BOOST_CHECK_EQUAL( a.size(), 2 );
+    BOOST_CHECK( a.find("bar") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("bar")->second, "baz" );
+    BOOST_CHECK( a.find("boo") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("boo")->second, "" );
+    a = p[1].second;
+    BOOST_CHECK_EQUAL( a.size(), 0 );
+
+    p.clear();
+    it = extract_parameters(s12.begin(),s12.end(),p);
+    BOOST_CHECK( it == s12.end() );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    a = p[0].second;
+    BOOST_CHECK_EQUAL( a.size(), 1 );
+    BOOST_CHECK( a.find("bar") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("bar")->second, "a b c" );
+
+    p.clear();
+    it = extract_parameters(s13.begin(),s13.end(),p);
+    BOOST_CHECK( it == s13.end() );
+    BOOST_CHECK_EQUAL( p.size(), 1 );
+    BOOST_CHECK( p[0].first == "foo" );
+    a = p[0].second;
+    BOOST_CHECK_EQUAL( a.size(), 1 );
+    BOOST_CHECK( a.find("bar") != a.end() );
+    BOOST_CHECK_EQUAL( a.find("bar")->second, "a \"b\" c" );
+}
+
+BOOST_AUTO_TEST_CASE( strip_lws ) {
+    std::string test1 = "foo";
+    std::string test2 = " foo ";
+    std::string test3 = "foo ";
+    std::string test4 = " foo";
+    std::string test5 = "    foo     ";
+    std::string test6 = "  \r\n  foo     ";
+    std::string test7 = "  \t  foo     ";
+    std::string test8 = "  \t       ";
+    std::string test9 = " \n\r";
+
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test1), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test2), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test3), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test4), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test5), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test6), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test7), "foo" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test8), "" );
+    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test9), "" );
+}
+
+BOOST_AUTO_TEST_CASE( case_insensitive_headers ) {
+    websocketpp::http::parser::parser r;
+
+    r.replace_header("foo","bar");
+
+    BOOST_CHECK_EQUAL( r.get_header("foo"), "bar" );
+    BOOST_CHECK_EQUAL( r.get_header("FOO"), "bar" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar" );
+}
+
+BOOST_AUTO_TEST_CASE( case_insensitive_headers_overwrite ) {
+    websocketpp::http::parser::parser r;
+
+    r.replace_header("foo","bar");
+
+    BOOST_CHECK_EQUAL( r.get_header("foo"), "bar" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar" );
+
+    r.replace_header("Foo","baz");
+
+    BOOST_CHECK_EQUAL( r.get_header("foo"), "baz" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "baz" );
+
+    r.remove_header("FoO");
+
+    BOOST_CHECK_EQUAL( r.get_header("foo"), "" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "" );
+}
+
+BOOST_AUTO_TEST_CASE( blank_consume ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw;
+
+    bool exception = false;
+
+    try {
+        r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK( r.ready() == false );
+}
+
+BOOST_AUTO_TEST_CASE( blank_request ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "\r\n\r\n";
+
+    bool exception = false;
+
+    try {
+        r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == true );
+    BOOST_CHECK( r.ready() == false );
+}
+
+BOOST_AUTO_TEST_CASE( bad_request_no_host ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\n\r\n";
+
+    bool exception = false;
+
+    try {
+        r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == true );
+    BOOST_CHECK( r.ready() == false );
+}
+
+BOOST_AUTO_TEST_CASE( basic_request ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK( pos == 41 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( basic_request_with_body ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nContent-Length: 5\r\n\r\nabcdef";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 65 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+    BOOST_CHECK_EQUAL( r.get_header("Content-Length"), "5" );
+    BOOST_CHECK_EQUAL( r.get_body(), "abcde" );
+}
+
+BOOST_AUTO_TEST_CASE( basic_request_with_body_split ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nContent-Length: 6\r\n\r\nabc";
+    std::string raw2 = "def";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+        pos += r.consume(raw2.c_str(),raw2.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 66 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+    BOOST_CHECK_EQUAL( r.get_header("Content-Length"), "6" );
+    BOOST_CHECK_EQUAL( r.get_body(), "abcdef" );
+}
+
+
+
+BOOST_AUTO_TEST_CASE( trailing_body_characters ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\na";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK( pos == 41 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( trailing_body_characters_beyond_max_lenth ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
+    raw.append(websocketpp::http::max_header_size,'*');
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK( pos == 41 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( basic_split1 ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\n";
+    std::string raw2 = "Host: www.example.com\r\n\r\na";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+        pos += r.consume(raw2.c_str(),raw2.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK( pos == 41 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( basic_split2 ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r";
+    std::string raw2 = "\n\r\na";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+        pos += r.consume(raw2.c_str(),raw2.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK( pos == 41 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( max_header_len ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw(websocketpp::http::max_header_size-1,'*');
+    raw += "\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+    } catch (const websocketpp::http::exception& e) {
+        if (e.m_error_code == websocketpp::http::status_code::request_header_fields_too_large) {
+            exception = true;
+        }
+    }
+
+    BOOST_CHECK( exception == true );
+}
+
+BOOST_AUTO_TEST_CASE( max_header_len_split ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw(websocketpp::http::max_header_size-1,'*');
+    std::string raw2(2,'*');
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+        pos += r.consume(raw2.c_str(),raw2.size());
+    } catch (const websocketpp::http::exception& e) {
+        if (e.m_error_code == websocketpp::http::status_code::request_header_fields_too_large) {
+            exception = true;
+        }
+    }
+
+    BOOST_CHECK( exception == true );
+}
+
+BOOST_AUTO_TEST_CASE( max_body_len ) {
+    websocketpp::http::parser::request r;
+    
+    r.set_max_body_size(5);
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nContent-Length: 6\r\n\r\nabcdef";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+    } catch (websocketpp::http::exception const & e) {
+        exception = true;
+        BOOST_CHECK_EQUAL(e.m_error_code,websocketpp::http::status_code::request_entity_too_large);
+    }
+
+    BOOST_CHECK_EQUAL(r.get_max_body_size(),5);
+    BOOST_CHECK( exception == true );
+}
+
+BOOST_AUTO_TEST_CASE( firefox_full_request ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK( pos == 482 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "localhost:5000" );
+    BOOST_CHECK( r.get_header("User-Agent") == "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0" );
+    BOOST_CHECK( r.get_header("Accept") == "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" );
+    BOOST_CHECK( r.get_header("Accept-Language") == "en-us,en;q=0.5" );
+    BOOST_CHECK( r.get_header("Accept-Encoding") == "gzip, deflate" );
+    BOOST_CHECK( r.get_header("Connection") == "keep-alive, Upgrade" );
+    BOOST_CHECK( r.get_header("Sec-WebSocket-Version") == "8" );
+    BOOST_CHECK( r.get_header("Sec-WebSocket-Origin") == "http://zaphoyd.com" );
+    BOOST_CHECK( r.get_header("Sec-WebSocket-Key") == "pFik//FxwFk0riN4ZiPFjQ==" );
+    BOOST_CHECK( r.get_header("Pragma") == "no-cache" );
+    BOOST_CHECK( r.get_header("Cache-Control") == "no-cache" );
+    BOOST_CHECK( r.get_header("Upgrade") == "websocket" );
+}
+
+BOOST_AUTO_TEST_CASE( bad_method ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GE]T / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
+
+    bool exception = false;
+
+    try {
+        r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == true );
+}
+
+BOOST_AUTO_TEST_CASE( bad_header_name ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHo]st: www.example.com\r\n\r\n";
+
+    bool exception = false;
+
+    try {
+        r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == true );
+}
+
+BOOST_AUTO_TEST_CASE( old_http_version ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.0\r\nHost: www.example.com\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 41 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.0" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( new_http_version1 ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.12\r\nHost: www.example.com\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 42 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.12" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( new_http_version2 ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/12.12\r\nHost: www.example.com\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 43 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/12.12" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+}
+
+/* commented out due to not being implemented yet
+
+BOOST_AUTO_TEST_CASE( new_http_version3 ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTPS/12.12\r\nHost: www.example.com\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == true );
+}*/
+
+BOOST_AUTO_TEST_CASE( header_whitespace1 ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost:  www.example.com \r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 43 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( header_whitespace2 ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost:www.example.com\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 40 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+}
+
+BOOST_AUTO_TEST_CASE( header_aggregation ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\nFoo: bar\r\nFoo: bat\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos = r.consume(raw.c_str(),raw.size());
+    } catch (...) {
+        exception = true;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 61 );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
+    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar, bat" );
+}
+
+BOOST_AUTO_TEST_CASE( wikipedia_example_response ) {
+    websocketpp::http::parser::response r;
+
+    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 159 );
+    BOOST_CHECK( r.headers_ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
+    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
+    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
+    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
+}
+
+BOOST_AUTO_TEST_CASE( wikipedia_example_response_trailing ) {
+    websocketpp::http::parser::response r;
+
+    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
+    raw += "a";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 159 );
+    BOOST_CHECK( r.headers_ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
+    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
+    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
+    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
+}
+
+BOOST_AUTO_TEST_CASE( wikipedia_example_response_trailing_large ) {
+    websocketpp::http::parser::response r;
+
+    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
+    raw.append(websocketpp::http::max_header_size,'*');
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 159 );
+    BOOST_CHECK( r.headers_ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
+    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
+    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
+    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
+}
+
+BOOST_AUTO_TEST_CASE( response_with_non_standard_lws ) {
+    websocketpp::http::parser::response r;
+
+    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept:HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 158 );
+    BOOST_CHECK( r.headers_ready() );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
+    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
+    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
+    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
+}
+
+BOOST_AUTO_TEST_CASE( plain_http_response ) {
+    websocketpp::http::parser::response r;
+
+    std::string raw = "HTTP/1.1 200 OK\r\nDate: Thu, 10 May 2012 11:59:25 GMT\r\nServer: Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch\r\nLast-Modified: Tue, 30 Mar 2010 17:41:28 GMT\r\nETag: \"16799d-55-4830823a78200\"\r\nAccept-Ranges: bytes\r\nContent-Length: 85\r\nVary: Accept-Encoding\r\nContent-Type: text/html\r\n\r\n<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(raw.c_str(),raw.size());
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK( exception == false );
+    BOOST_CHECK_EQUAL( pos, 405 );
+    BOOST_CHECK( r.headers_ready() == true );
+    BOOST_CHECK( r.ready() == true );
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
+    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::ok );
+    BOOST_CHECK_EQUAL( r.get_status_msg(), "OK" );
+    BOOST_CHECK_EQUAL( r.get_header("Date"), "Thu, 10 May 2012 11:59:25 GMT" );
+    BOOST_CHECK_EQUAL( r.get_header("Server"), "Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch" );
+    BOOST_CHECK_EQUAL( r.get_header("Last-Modified"), "Tue, 30 Mar 2010 17:41:28 GMT" );
+    BOOST_CHECK_EQUAL( r.get_header("ETag"), "\"16799d-55-4830823a78200\"" );
+    BOOST_CHECK_EQUAL( r.get_header("Accept-Ranges"), "bytes" );
+    BOOST_CHECK_EQUAL( r.get_header("Content-Length"), "85" );
+    BOOST_CHECK_EQUAL( r.get_header("Vary"), "Accept-Encoding" );
+    BOOST_CHECK_EQUAL( r.get_header("Content-Type"), "text/html" );
+    BOOST_CHECK_EQUAL( r.get_body(), "<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>" );
+}
+
+BOOST_AUTO_TEST_CASE( parse_istream ) {
+    websocketpp::http::parser::response r;
+
+    std::stringstream s;
+
+    s << "HTTP/1.1 200 OK\r\nDate: Thu, 10 May 2012 11:59:25 GMT\r\nServer: Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch\r\nLast-Modified: Tue, 30 Mar 2010 17:41:28 GMT\r\nETag: \"16799d-55-4830823a78200\"\r\nAccept-Ranges: bytes\r\nContent-Length: 85\r\nVary: Accept-Encoding\r\nContent-Type: text/html\r\n\r\n<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>";
+
+    bool exception = false;
+    size_t pos = 0;
+
+    try {
+        pos += r.consume(s);
+    } catch (std::exception &e) {
+        exception = true;
+        std::cout << e.what() << std::endl;
+    }
+
+    BOOST_CHECK_EQUAL( exception, false );
+    BOOST_CHECK_EQUAL( pos, 405 );
+    BOOST_CHECK_EQUAL( r.headers_ready(), true );
+    BOOST_CHECK_EQUAL( r.ready(), true );
+}
+
+BOOST_AUTO_TEST_CASE( write_request_basic ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\n\r\n";
+
+    r.set_version("HTTP/1.1");
+    r.set_method("GET");
+    r.set_uri("/");
+
+    BOOST_CHECK_EQUAL( r.raw(), raw );
+}
+
+BOOST_AUTO_TEST_CASE( write_request_with_header ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "GET / HTTP/1.1\r\nHost: http://example.com\r\n\r\n";
+
+    r.set_version("HTTP/1.1");
+    r.set_method("GET");
+    r.set_uri("/");
+    r.replace_header("Host","http://example.com");
+
+    BOOST_CHECK_EQUAL( r.raw(), raw );
+}
+
+BOOST_AUTO_TEST_CASE( write_request_with_body ) {
+    websocketpp::http::parser::request r;
+
+    std::string raw = "POST / HTTP/1.1\r\nContent-Length: 48\r\nContent-Type: application/x-www-form-urlencoded\r\nHost: http://example.com\r\n\r\nlicenseID=string&content=string&paramsXML=string";
+
+    r.set_version("HTTP/1.1");
+    r.set_method("POST");
+    r.set_uri("/");
+    r.replace_header("Host","http://example.com");
+    r.replace_header("Content-Type","application/x-www-form-urlencoded");
+    r.set_body("licenseID=string&content=string&paramsXML=string");
+
+    BOOST_CHECK_EQUAL( r.raw(), raw );
+}
diff --git a/vendor/websocketpp/test/http/parser_perf.cpp b/vendor/websocketpp/test/http/parser_perf.cpp
new file mode 100644
index 0000000..0c76bc7
--- /dev/null
+++ b/vendor/websocketpp/test/http/parser_perf.cpp
@@ -0,0 +1,141 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#include <websocketpp/http/parser.hpp>
+
+#include <chrono>
+
+class scoped_timer {
+public:
+    scoped_timer(std::string i) : m_id(i),m_start(std::chrono::steady_clock::now()) {
+        std::cout << "Clock " << i << ": ";
+    }
+    ~scoped_timer() {
+        std::chrono::nanoseconds time_taken = std::chrono::steady_clock::now()-m_start;
+
+        //nanoseconds_per_test
+
+        //tests_per_second
+
+        //1000000000.0/(double(time_taken.count())/1000.0)
+
+        std::cout << 1000000000.0/(double(time_taken.count())/1000.0) << std::endl;
+
+        //std::cout << (1.0/double(time_taken.count())) * double(1000000000*1000) << std::endl;
+    }
+
+private:
+    std::string m_id;
+    std::chrono::steady_clock::time_point m_start;
+};
+
+int main() {
+    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
+
+    std::string firefox = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\nAccept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
+
+    std::string firefox1 = "GET / HTTP/1.1\r\nHost: localhost:5000\r\nUser-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:10.0) Gecko/20100101 Firefox/10.0\r\nAccept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\nAccept-Language: en-us,en;q=0.5\r\n";
+
+    std::string firefox2 = "Accept-Encoding: gzip, deflate\r\nConnection: keep-alive, Upgrade\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Origin: http://zaphoyd.com\r\nSec-WebSocket-Key: pFik//FxwFk0riN4ZiPFjQ==\r\nPragma: no-cache\r\nCache-Control: no-cache\r\nUpgrade: websocket\r\n\r\n";
+
+    {
+        scoped_timer timer("Simplest 1 chop");
+        for (int i = 0; i < 1000; i++) {
+            websocketpp::http::parser::request r;
+
+            try {
+                r.consume(raw.c_str(),raw.size());
+            } catch (...) {
+                std::cout << "exception" << std::endl;
+            }
+
+            if (!r.ready()) {
+                std::cout << "error" << std::endl;
+                break;
+            }
+        }
+    }
+
+    {
+        scoped_timer timer("FireFox, 1 chop, consume old");
+        for (int i = 0; i < 1000; i++) {
+            websocketpp::http::parser::request r;
+
+            try {
+                r.consume2(firefox.c_str(),firefox.size());
+            } catch (...) {
+                std::cout << "exception" << std::endl;
+            }
+
+            if (!r.ready()) {
+                std::cout << "error" << std::endl;
+                break;
+            }
+        }
+    }
+
+    {
+        scoped_timer timer("FireFox, 1 chop");
+        for (int i = 0; i < 1000; i++) {
+            websocketpp::http::parser::request r;
+
+            try {
+                r.consume(firefox.c_str(),firefox.size());
+            } catch (...) {
+                std::cout << "exception" << std::endl;
+            }
+
+            if (!r.ready()) {
+                std::cout << "error" << std::endl;
+                break;
+            }
+        }
+    }
+
+
+
+    {
+        scoped_timer timer("FireFox, 2 chop");
+        for (int i = 0; i < 1000; i++) {
+            websocketpp::http::parser::request r;
+
+            try {
+                r.consume(firefox1.c_str(),firefox1.size());
+                r.consume(firefox2.c_str(),firefox2.size());
+            } catch (...) {
+                std::cout << "exception" << std::endl;
+            }
+
+            if (!r.ready()) {
+                std::cout << "error" << std::endl;
+                break;
+            }
+        }
+    }
+
+    return 0;
+}
diff --git a/vendor/websocketpp/test/logger/CMakeLists.txt b/vendor/websocketpp/test/logger/CMakeLists.txt
new file mode 100644
index 0000000..42d8b7c
--- /dev/null
+++ b/vendor/websocketpp/test/logger/CMakeLists.txt
@@ -0,0 +1,12 @@
+
+file (GLOB SOURCE_FILES *.cpp)
+file (GLOB HEADER_FILES *.hpp)
+
+init_target (test_logger)
+
+build_test (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
+
+link_boost ()
+final_target ()
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/vendor/websocketpp/test/logger/SConscript b/vendor/websocketpp/test/logger/SConscript
new file mode 100644
index 0000000..81d6076
--- /dev/null
+++ b/vendor/websocketpp/test/logger/SConscript
@@ -0,0 +1,23 @@
+## logger unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
+
+objs = env.Object('logger_basic_boost.o', ["basic.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('logger_basic_boost', ["logger_basic_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   objs += env_cpp11.Object('logger_basic_stl.o', ["basic.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('logger_basic_stl', ["logger_basic_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/logger/basic.cpp b/vendor/websocketpp/test/logger/basic.cpp
new file mode 100644
index 0000000..a730535
--- /dev/null
+++ b/vendor/websocketpp/test/logger/basic.cpp
@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE basic_log
+#include <boost/test/unit_test.hpp>
+
+#include <string>
+
+#include <websocketpp/logger/basic.hpp>
+#include <websocketpp/concurrency/none.hpp>
+#include <websocketpp/concurrency/basic.hpp>
+
+typedef websocketpp::log::basic<websocketpp::concurrency::basic,websocketpp::log::alevel> basic_access_log_type;
+
+BOOST_AUTO_TEST_CASE( is_token_char ) {
+    typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::elevel> error_log;
+
+    error_log elog;
+
+    BOOST_CHECK( elog.static_test(websocketpp::log::elevel::info ) == true );
+    BOOST_CHECK( elog.static_test(websocketpp::log::elevel::warn ) == true );
+    BOOST_CHECK( elog.static_test(websocketpp::log::elevel::rerror ) == true );
+    BOOST_CHECK( elog.static_test(websocketpp::log::elevel::fatal ) == true );
+
+    elog.set_channels(websocketpp::log::elevel::info);
+
+    elog.write(websocketpp::log::elevel::info,"Information");
+    elog.write(websocketpp::log::elevel::warn,"A warning");
+    elog.write(websocketpp::log::elevel::rerror,"A error");
+    elog.write(websocketpp::log::elevel::fatal,"A critical error");
+}
+
+BOOST_AUTO_TEST_CASE( access_clear ) {
+    typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::alevel> access_log;
+
+    std::stringstream out;
+    access_log logger(0xffffffff,&out);
+
+    // clear all channels
+    logger.clear_channels(0xffffffff);
+
+    // writes shouldn't happen
+    logger.write(websocketpp::log::alevel::devel,"devel");
+    //std::cout << "|" << out.str() << "|" << std::endl;
+    BOOST_CHECK( out.str().size() == 0 );
+}
+
+BOOST_AUTO_TEST_CASE( basic_concurrency ) {
+    typedef websocketpp::log::basic<websocketpp::concurrency::basic,websocketpp::log::alevel> access_log;
+
+    std::stringstream out;
+    access_log logger(0xffffffff,&out);
+
+    logger.set_channels(0xffffffff);
+
+    logger.write(websocketpp::log::alevel::devel,"devel");
+    //std::cout << "|" << out.str() << "|" << std::endl;
+    BOOST_CHECK( out.str().size() > 0 );
+}
+
+
+BOOST_AUTO_TEST_CASE( copy_constructor ) {
+    std::stringstream out;
+
+    basic_access_log_type logger1(0xffffffff,&out);
+    basic_access_log_type logger2(logger1);
+
+    logger2.set_channels(0xffffffff);
+    logger2.write(websocketpp::log::alevel::devel,"devel");
+    BOOST_CHECK( out.str().size() > 0 );
+}
+
+#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+BOOST_AUTO_TEST_CASE( move_constructor ) {
+    std::stringstream out;
+
+    basic_access_log_type logger1(0xffffffff,&out);
+    basic_access_log_type logger2(std::move(logger1));
+
+    logger2.set_channels(0xffffffff);
+    logger2.write(websocketpp::log::alevel::devel,"devel");
+    BOOST_CHECK( out.str().size() > 0 );
+}
+
+// Emplace requires move assignment, which logger doesn't support right now
+// due to const members. This is pretty irritating and will probably result in
+// the const members being removed. For now though this test will fail to
+// compile
+/*BOOST_AUTO_TEST_CASE( emplace ) {
+    std::stringstream out1;
+    std::stringstream out2;
+
+    std::vector<basic_access_log_type> v;
+
+    v.emplace_back(websocketpp::log::level(0xffffffff),&out1);
+    v.emplace_back(websocketpp::log::level(0xffffffff),&out2);
+
+    v[0].set_channels(0xffffffff);
+    v[1].set_channels(0xffffffff);
+    v[0].write(websocketpp::log::alevel::devel,"devel");
+    v[1].write(websocketpp::log::alevel::devel,"devel");
+    BOOST_CHECK( out1.str().size() > 0 );
+    BOOST_CHECK( out2.str().size() > 0 );
+}*/
+#endif // #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+
+// As long as there are const member variables these can't exist
+// These remain commented as they are useful for testing the deleted operators
+/*BOOST_AUTO_TEST_CASE( copy_assign ) {
+    basic_access_log_type logger1;
+    basic_access_log_type logger2;
+
+    logger2 = logger1;
+}
+
+BOOST_AUTO_TEST_CASE( move_assign ) {
+    basic_access_log_type logger1;
+    basic_access_log_type logger2;
+
+    logger2 = std::move(logger1);
+}*/
diff --git a/vendor/websocketpp/test/message_buffer/CMakeLists.txt b/vendor/websocketpp/test/message_buffer/CMakeLists.txt
new file mode 100644
index 0000000..cd17e55
--- /dev/null
+++ b/vendor/websocketpp/test/message_buffer/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Test alloc message buffer strategy
+file (GLOB SOURCE alloc.cpp)
+
+init_target (test_message_alloc)
+build_executable (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test message buffers
+file (GLOB SOURCE message.cpp)
+
+init_target (test_message_buffer)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/vendor/websocketpp/test/message_buffer/SConscript b/vendor/websocketpp/test/message_buffer/SConscript
new file mode 100644
index 0000000..2ef6d71
--- /dev/null
+++ b/vendor/websocketpp/test/message_buffer/SConscript
@@ -0,0 +1,27 @@
+## message_buffer unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
+
+objs = env.Object('message_boost.o', ["message.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('alloc_boost.o', ["alloc.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_message_boost', ["message_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_alloc_boost', ["alloc_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   objs += env_cpp11.Object('message_stl.o', ["message.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('alloc_stl.o', ["alloc.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_message_stl', ["message_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_alloc_stl', ["alloc_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/message_buffer/alloc.cpp b/vendor/websocketpp/test/message_buffer/alloc.cpp
new file mode 100644
index 0000000..9f6ba2a
--- /dev/null
+++ b/vendor/websocketpp/test/message_buffer/alloc.cpp
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE message_buffer_alloc
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/message_buffer/alloc.hpp>
+
+template <template <class> class con_msg_manager>
+struct stub {
+    typedef websocketpp::lib::shared_ptr<stub> ptr;
+
+    typedef con_msg_manager<stub> con_msg_man_type;
+    typedef typename con_msg_man_type::ptr con_msg_man_ptr;
+    typedef typename con_msg_man_type::weak_ptr con_msg_man_weak_ptr;
+
+    stub(con_msg_man_ptr manager, websocketpp::frame::opcode::value op, size_t size = 128)
+      : m_opcode(op)
+      , m_manager(manager)
+      , m_size(size) {}
+
+    bool recycle() {
+        con_msg_man_ptr shared = m_manager.lock();
+
+        if (shared) {
+            return shared->recycle(this);
+        } else {
+            return false;
+        }
+    }
+
+    websocketpp::frame::opcode::value   m_opcode;
+    con_msg_man_weak_ptr                m_manager;
+    size_t                              m_size;
+};
+
+BOOST_AUTO_TEST_CASE( basic_get_message ) {
+    typedef stub<websocketpp::message_buffer::alloc::con_msg_manager>
+        message_type;
+    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_man_type;
+
+    con_msg_man_type::ptr manager(new con_msg_man_type());
+    message_type::ptr msg = manager->get_message(websocketpp::frame::opcode::TEXT,512);
+
+    BOOST_CHECK(msg);
+    BOOST_CHECK(msg->m_opcode == websocketpp::frame::opcode::TEXT);
+    BOOST_CHECK(msg->m_manager.lock() == manager);
+    BOOST_CHECK(msg->m_size == 512);
+}
+
+BOOST_AUTO_TEST_CASE( basic_get_manager ) {
+    typedef stub<websocketpp::message_buffer::alloc::con_msg_manager>
+        message_type;
+    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_man_type;
+    typedef websocketpp::message_buffer::alloc::endpoint_msg_manager
+        <con_msg_man_type> endpoint_manager_type;
+
+    endpoint_manager_type em;
+    con_msg_man_type::ptr manager = em.get_manager();
+    message_type::ptr msg = manager->get_message(websocketpp::frame::opcode::TEXT,512);
+
+    BOOST_CHECK(msg);
+    BOOST_CHECK(msg->m_opcode == websocketpp::frame::opcode::TEXT);
+    BOOST_CHECK(msg->m_manager.lock() == manager);
+    BOOST_CHECK(msg->m_size == 512);
+}
+
diff --git a/vendor/websocketpp/test/message_buffer/message.cpp b/vendor/websocketpp/test/message_buffer/message.cpp
new file mode 100644
index 0000000..1fb12d3
--- /dev/null
+++ b/vendor/websocketpp/test/message_buffer/message.cpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE message
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/message_buffer/message.hpp>
+
+template <typename message>
+struct stub {
+    typedef websocketpp::lib::weak_ptr<stub> weak_ptr;
+    typedef websocketpp::lib::shared_ptr<stub> ptr;
+
+    stub() : recycled(false) {}
+
+    bool recycle(message *) {
+        this->recycled = true;
+        return false;
+    }
+
+    bool recycled;
+};
+
+BOOST_AUTO_TEST_CASE( basic_size_check ) {
+    typedef websocketpp::message_buffer::message<stub> message_type;
+    typedef stub<message_type> stub_type;
+
+    stub_type::ptr s(new stub_type());
+    message_type::ptr msg(new message_type(s,websocketpp::frame::opcode::TEXT,500));
+
+    BOOST_CHECK(msg->get_payload().capacity() >= 500);
+}
+
+BOOST_AUTO_TEST_CASE( recycle ) {
+    typedef websocketpp::message_buffer::message<stub> message_type;
+    typedef stub<message_type> stub_type;
+
+    stub_type::ptr s(new stub_type());
+    message_type::ptr msg(new message_type(s,websocketpp::frame::opcode::TEXT,500));
+
+    BOOST_CHECK(s->recycled == false);
+    BOOST_CHECK(msg->recycle() == false);
+    BOOST_CHECK(s->recycled == true);
+}
+
diff --git a/vendor/websocketpp/test/message_buffer/pool.cpp b/vendor/websocketpp/test/message_buffer/pool.cpp
new file mode 100644
index 0000000..70f020d
--- /dev/null
+++ b/vendor/websocketpp/test/message_buffer/pool.cpp
@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE hybi_00_processor
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/processors/hybi00.hpp>
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+
+
+BOOST_AUTO_TEST_CASE( exact_match ) {
+    websocketpp::http::parser::request r;
+    websocketpp::http::parser::response response;
+    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+    r.replace_header("Sec-WebSocket-Key3","WjN}|M(6");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    BOOST_CHECK(p.validate_handshake(r));
+
+    websocketpp::uri_ptr u;
+    bool exception;
+
+    try {
+        u = p.get_uri(r);
+    } catch (const websocketpp::uri_exception& e) {
+        exception = true;
+    }
+
+    BOOST_CHECK(exception == false);
+    BOOST_CHECK(u->get_secure() == false);
+    BOOST_CHECK(u->get_host() == "www.example.com");
+    BOOST_CHECK(u->get_resource() == "/");
+    BOOST_CHECK(u->get_port() == websocketpp::URI_DEFAULT_PORT);
+
+    p.process_handshake(r,response);
+
+    BOOST_CHECK(response.get_header("Connection") == "Upgrade");
+    BOOST_CHECK(response.get_header("Upgrade") == "websocket");
+    BOOST_CHECK(response.get_header("Sec-WebSocket-Origin") == "http://example.com");
+
+    BOOST_CHECK(response.get_header("Sec-WebSocket-Location") == "ws://www.example.com/");
+    BOOST_CHECK(response.get_header("Sec-WebSocket-Key3") == "n`9eBk9z$R8pOtVb");
+}
+
+BOOST_AUTO_TEST_CASE( non_get_method ) {
+    websocketpp::http::parser::request r;
+    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
+
+    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+    r.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    BOOST_CHECK(!p.validate_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( old_http_version ) {
+    websocketpp::http::parser::request r;
+    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
+
+    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+    r.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    BOOST_CHECK(!p.validate_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
+    websocketpp::http::parser::request r;
+    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+    r.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    BOOST_CHECK(!p.validate_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
+    websocketpp::http::parser::request r;
+    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+    r.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    BOOST_CHECK(!p.validate_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( bad_host ) {
+    websocketpp::http::parser::request r;
+    websocketpp::processor::hybi00<websocketpp::http::parser::request,websocketpp::http::parser::response> p(false);
+    websocketpp::uri_ptr u;
+    bool exception = false;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+    r.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    BOOST_CHECK(!p.validate_handshake(r));
+
+    try {
+        u = p.get_uri(r);
+    } catch (const websocketpp::uri_exception& e) {
+        exception = true;
+    }
+
+    BOOST_CHECK(exception == true);
+}
diff --git a/vendor/websocketpp/test/processors/CMakeLists.txt b/vendor/websocketpp/test/processors/CMakeLists.txt
new file mode 100644
index 0000000..42b0468
--- /dev/null
+++ b/vendor/websocketpp/test/processors/CMakeLists.txt
@@ -0,0 +1,59 @@
+# Generic processor tests
+file (GLOB SOURCE processor.cpp)
+
+init_target (test_processor)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Hybi00 processor tests
+file (GLOB SOURCE hybi00.cpp)
+
+init_target (test_processor_hybi00)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Hybi07 processor tests
+file (GLOB SOURCE hybi07.cpp)
+
+init_target (test_processor_hybi07)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Hybi08 processor tests
+file (GLOB SOURCE hybi08.cpp)
+
+init_target (test_processor_hybi08)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+if (ZLIB_FOUND)
+
+# Hybi13 processor tests
+file (GLOB SOURCE hybi13.cpp)
+
+init_target (test_processor_hybi13)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+link_zlib()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Permessage compression extension processor tests
+file (GLOB SOURCE extension_permessage_compress.cpp)
+
+init_target (test_processor_extension_permessage_compress)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+link_zlib()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+endif ( ZLIB_FOUND )
\ No newline at end of file
diff --git a/vendor/websocketpp/test/processors/SConscript b/vendor/websocketpp/test/processors/SConscript
new file mode 100644
index 0000000..406a7ed
--- /dev/null
+++ b/vendor/websocketpp/test/processors/SConscript
@@ -0,0 +1,47 @@
+## processor unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs] + ['z']
+
+objs = env.Object('test_processor_boost.o', ["processor.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('test_hybi13_boost.o', ["hybi13.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('test_hybi08_boost.o', ["hybi08.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('test_hybi07_boost.o', ["hybi07.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('test_hybi00_boost.o', ["hybi00.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('test_extension_permessage_compress_boost.o', ["extension_permessage_compress.cpp"], LIBS = BOOST_LIBS)
+
+prgs = env.Program('test_processor_boost', ["test_processor_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_hybi13_boost', ["test_hybi13_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_hybi08_boost', ["test_hybi08_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_hybi07_boost', ["test_hybi07_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_hybi00_boost', ["test_hybi00_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_extension_permessage_compress_boost', ["test_extension_permessage_compress_boost.o"], LIBS = BOOST_LIBS + ['z'])
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
+   # no C++11 features are used in processor so there are no C++11 versions of
+   # these tests.
+   objs += env_cpp11.Object('test_processor_stl.o', ["processor.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('test_hybi13_stl.o', ["hybi13.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('test_hybi08_stl.o', ["hybi08.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('test_hybi07_stl.o', ["hybi07.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('test_hybi00_stl.o', ["hybi00.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('test_extension_permessage_compress_stl.o', ["extension_permessage_compress.cpp"], LIBS = BOOST_LIBS_CPP11 + ['z'])
+
+   prgs += env_cpp11.Program('test_processor_stl', ["test_processor_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_hybi13_stl', ["test_hybi13_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_hybi08_stl', ["test_hybi08_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_hybi07_stl', ["test_hybi07_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_hybi00_stl', ["test_hybi00_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_extension_permessage_compress_stl', ["test_extension_permessage_compress_stl.o"], LIBS = BOOST_LIBS_CPP11 + ['z'])
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/processors/extension_permessage_compress.cpp b/vendor/websocketpp/test/processors/extension_permessage_compress.cpp
new file mode 100644
index 0000000..7f26a9d
--- /dev/null
+++ b/vendor/websocketpp/test/processors/extension_permessage_compress.cpp
@@ -0,0 +1,198 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE extension_permessage_deflate
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+#include <websocketpp/common/memory.hpp>
+
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+struct config {
+    typedef websocketpp::http::parser::request request_type;
+};
+typedef websocketpp::extensions::permessage_deflate::enabled<config>
+    compressor_type;
+
+using namespace websocketpp;
+
+BOOST_AUTO_TEST_CASE( deflate_init ) {
+    /*compressor_type compressor;
+    websocketpp::http::parser::attribute_list attributes;
+    std::pair<lib::error_code,std::string> neg_ret;
+
+    neg_ret = compressor.negotiate(attributes);
+
+    BOOST_CHECK_EQUAL( neg_ret.first,
+        extensions::permessage_deflate::error::invalid_parameters );*/
+
+    /**
+     * Window size is primarily controlled by the writer. A stream can only be
+     * read by a window size equal to or greater than the one use to compress
+     * it initially. The default windows size is also the maximum window size.
+     * Thus:
+     *
+     * Outbound window size can be limited unilaterally under the assumption
+     * that the opposite end will be using the default (maximum size which can
+     * read anything)
+     *
+     * Inbound window size must be limited by asking the remote endpoint to
+     * do so and it agreeing.
+     *
+     * Context takeover is also primarily controlled by the writer. If the
+     * compressor does not clear its context between messages then the reader
+     * can't either.
+     *
+     * Outbound messages may clear context between messages unilaterally.
+     * Inbound messages must retain state unless the remote endpoint signals
+     * otherwise.
+     *
+     * Negotiation options:
+     * Client must choose from the following options:
+     * - whether or not to request an inbound window limit
+     * - whether or not to signal that it will honor an outbound window limit
+     * - whether or not to request that the server disallow context takeover
+     *
+     * Server must answer in the following ways
+     * - If client requested a window size limit, is the window size limit
+     *   acceptable?
+     * - If client allows window limit requests, should we send one?
+     * - If client requested no context takeover, should we accept?
+     *
+     *
+     *
+     * All Defaults
+     * Req: permessage-compress; method=deflate
+     * Ans: permessage-compress; method=deflate
+     *
+     * # Client wants to limit the size of inbound windows from server
+     * permessage-compress; method="deflate; s2c_max_window_bits=8, deflate"
+     * Ans: permessage-compress; method="deflate; s2c_max_window_bits=8"
+     * OR
+     * Ans: permessage-compress; method=deflate
+     *
+     * # Server wants to limit the size of inbound windows from client
+     * Client:
+     * permessage-compress; method="deflate; c2s_max_window_bits, deflate"
+     *
+     * Server:
+     * permessage-compress; method="deflate; c2s_max_window_bits=8"
+     *
+     * # Client wants to
+     *
+     *
+     *
+     *
+     *
+     *
+     */
+
+
+
+
+   /* processor::extensions::deflate_method d(true);
+    http::parser::attribute_list attributes;
+    lib::error_code ec;
+
+    attributes.push_back(http::parser::attribute("foo","bar"));
+    ec = d.init(attributes);
+    BOOST_CHECK(ec == processor::extensions::error::unknown_method_parameter);
+
+    attributes.clear();
+    attributes.push_back(http::parser::attribute("s2c_max_window_bits","bar"));
+    ec = d.init(attributes);
+    BOOST_CHECK(ec == processor::extensions::error::invalid_algorithm_settings);
+
+    attributes.clear();
+    attributes.push_back(http::parser::attribute("s2c_max_window_bits","7"));
+    ec = d.init(attributes);
+    BOOST_CHECK(ec == processor::extensions::error::invalid_algorithm_settings);
+
+    attributes.clear();
+    attributes.push_back(http::parser::attribute("s2c_max_window_bits","16"));
+    ec = d.init(attributes);
+    BOOST_CHECK(ec == processor::extensions::error::invalid_algorithm_settings);
+
+    attributes.clear();
+    attributes.push_back(http::parser::attribute("s2c_max_window_bits","9"));
+    ec = d.init(attributes);
+    BOOST_CHECK( !ec);
+
+    attributes.clear();
+    ec = d.init(attributes);
+    BOOST_CHECK( !ec);
+
+    processor::extensions::deflate_engine de;
+
+    unsigned char test_in[] = "HelloHelloHelloHello";
+    unsigned char test_out[30];
+
+    uLongf test_out_size = 30;
+
+    int ret;
+
+    ret = compress(test_out, &test_out_size, test_in, 20);
+
+    std::cout << ret << std::endl
+              << websocketpp::utility::to_hex(test_in,20) << std::endl
+              << websocketpp::utility::to_hex(test_out,test_out_size) << std::endl;
+
+    std::string input = "Hello";
+    std::string output;
+    ec = de.compress(input,output);
+
+    BOOST_CHECK( ec == processor::extensions::error::uninitialized );
+
+    //std::cout << ec.message() << websocketpp::utility::to_hex(output) << std::endl;
+
+    ec = de.init(15,15,Z_DEFAULT_COMPRESSION,8,Z_FIXED);
+    //ec = de.init();
+    BOOST_CHECK( !ec );
+
+    ec = de.compress(input,output);
+    std::cout << ec.message() << std::endl
+              << websocketpp::utility::to_hex(input) << std::endl
+              << websocketpp::utility::to_hex(output) << std::endl;
+
+    output.clear();
+
+    ec = de.compress(input,output);
+    std::cout << ec.message() << std::endl
+              << websocketpp::utility::to_hex(input) << std::endl
+              << websocketpp::utility::to_hex(output) << std::endl;
+
+    input = output;
+    output.clear();
+    ec = de.decompress(input,output);
+    std::cout << ec.message() << std::endl
+              << websocketpp::utility::to_hex(input) << std::endl
+              << websocketpp::utility::to_hex(output) << std::endl;
+    */
+}
diff --git a/vendor/websocketpp/test/processors/hybi00.cpp b/vendor/websocketpp/test/processors/hybi00.cpp
new file mode 100644
index 0000000..b201e8a
--- /dev/null
+++ b/vendor/websocketpp/test/processors/hybi00.cpp
@@ -0,0 +1,274 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE hybi_00_processor
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/processors/hybi00.hpp>
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+#include <websocketpp/message_buffer/message.hpp>
+#include <websocketpp/message_buffer/alloc.hpp>
+
+struct stub_config {
+    typedef websocketpp::http::parser::request request_type;
+    typedef websocketpp::http::parser::response response_type;
+
+    typedef websocketpp::message_buffer::message
+        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
+    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+        
+    static const size_t max_message_size = 16000000;
+};
+
+struct processor_setup {
+    processor_setup(bool server)
+      : msg_manager(new stub_config::con_msg_manager_type())
+      , p(false,server,msg_manager) {}
+
+    websocketpp::lib::error_code ec;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::request_type req;
+    stub_config::response_type res;
+    websocketpp::processor::hybi00<stub_config> p;
+};
+
+typedef stub_config::message_type::ptr message_ptr;
+
+BOOST_AUTO_TEST_CASE( exact_match ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+    env.req.replace_header("Sec-WebSocket-Key3","WjN}|M(6");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    env.ec = env.p.validate_handshake(env.req);
+    BOOST_CHECK(!env.ec);
+
+    websocketpp::uri_ptr u;
+
+    BOOST_CHECK_NO_THROW( u = env.p.get_uri(env.req) );
+
+    BOOST_CHECK_EQUAL(u->get_secure(), false);
+    BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
+    BOOST_CHECK_EQUAL(u->get_resource(), "/");
+    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
+
+    env.p.process_handshake(env.req,"",env.res);
+
+    BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "Upgrade");
+    BOOST_CHECK_EQUAL(env.res.get_header("Upgrade"), "WebSocket");
+    BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Origin"), "http://example.com");
+
+    BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Location"), "ws://www.example.com/");
+    BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Key3"), "n`9eBk9z$R8pOtVb");
+}
+
+BOOST_AUTO_TEST_CASE( non_get_method ) {
+    processor_setup env(true);
+
+    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_method );
+}
+
+BOOST_AUTO_TEST_CASE( old_http_version ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_version );
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( bad_host ) {
+    processor_setup env(true);
+    websocketpp::uri_ptr u;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nOrigin: http://example.com\r\nSec-WebSocket-Key1: 3e6b263  4 17 80\r\nSec-WebSocket-Key2: 17  9 G`ZD9   2 2b 7X 3 /r90\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+    env.req.replace_header("Sec-WebSocket-Key3","janelle!");
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    BOOST_CHECK( !env.p.validate_handshake(env.req) );
+
+    BOOST_CHECK( !env.p.get_uri(env.req)->get_valid() );
+}
+
+BOOST_AUTO_TEST_CASE( extract_subprotocols ) {
+    processor_setup env(true);
+
+    std::vector<std::string> subps;
+
+    BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
+    BOOST_CHECK_EQUAL( subps.size(), 0 );
+}
+
+BOOST_AUTO_TEST_CASE( prepare_data_frame_null ) {
+    processor_setup env(true);
+
+    message_ptr in = env.msg_manager->get_message();
+    message_ptr out = env.msg_manager->get_message();
+    message_ptr invalid;
+
+
+    // empty pointers arguements should return sane error
+    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,invalid), websocketpp::processor::error::invalid_arguments );
+
+    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(in,invalid), websocketpp::processor::error::invalid_arguments );
+
+    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,out), websocketpp::processor::error::invalid_arguments );
+
+    // test valid opcodes
+    // text (1) should be the only valid opcode
+    for (int i = 0; i < 0xF; i++) {
+        in->set_opcode(websocketpp::frame::opcode::value(i));
+
+        env.ec = env.p.prepare_data_frame(in,out);
+
+        if (i != 1) {
+            BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode );
+        } else {
+            BOOST_CHECK_NE( env.ec, websocketpp::processor::error::invalid_opcode );
+        }
+    }
+
+    /*
+     * TODO: tests for invalid UTF8
+    char buf[2] = {0x00, 0x00};
+
+    in->set_opcode(websocketpp::frame::opcode::text);
+    in->set_payload("foo");
+
+    env.ec = env.p.prepare_data_frame(in,out);
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_payload );
+    */
+}
+
+BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
+    processor_setup env(true);
+
+    message_ptr in = env.msg_manager->get_message();
+    message_ptr out = env.msg_manager->get_message();
+
+    in->set_opcode(websocketpp::frame::opcode::text);
+    in->set_payload("foo");
+
+    env.ec = env.p.prepare_data_frame(in,out);
+
+    unsigned char raw_header[1] = {0x00};
+    unsigned char raw_payload[4] = {0x66,0x6f,0x6f,0xff};
+
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( out->get_header(), std::string(reinterpret_cast<char*>(raw_header),1) );
+    BOOST_CHECK_EQUAL( out->get_payload(), std::string(reinterpret_cast<char*>(raw_payload),4) );
+}
+
+
+BOOST_AUTO_TEST_CASE( empty_consume ) {
+    uint8_t frame[2] = {0x00,0x00};
+
+    processor_setup env(true);
+
+    size_t ret = env.p.consume(frame,0,env.ec);
+
+    BOOST_CHECK_EQUAL( ret, 0);
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( env.p.ready(), false );
+}
+
+BOOST_AUTO_TEST_CASE( empty_frame ) {
+    uint8_t frame[2] = {0x00, 0xff};
+
+    processor_setup env(true);
+
+    size_t ret = env.p.consume(frame,2,env.ec);
+
+    BOOST_CHECK_EQUAL( ret, 2);
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( env.p.ready(), true );
+    BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "" );
+    BOOST_CHECK_EQUAL( env.p.ready(), false );
+}
+
+BOOST_AUTO_TEST_CASE( short_frame ) {
+    uint8_t frame[5] = {0x00, 0x66, 0x6f, 0x6f, 0xff};
+
+    processor_setup env(true);
+
+    size_t ret = env.p.consume(frame,5,env.ec);
+
+    BOOST_CHECK_EQUAL( ret, 5);
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( env.p.ready(), true );
+    BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "foo" );
+    BOOST_CHECK_EQUAL( env.p.ready(), false );
+}
diff --git a/vendor/websocketpp/test/processors/hybi07.cpp b/vendor/websocketpp/test/processors/hybi07.cpp
new file mode 100644
index 0000000..7898f35
--- /dev/null
+++ b/vendor/websocketpp/test/processors/hybi07.cpp
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE hybi_07_processor
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/processors/hybi07.hpp>
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+#include <websocketpp/message_buffer/message.hpp>
+#include <websocketpp/message_buffer/alloc.hpp>
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+#include <websocketpp/random/none.hpp>
+
+struct stub_config {
+    typedef websocketpp::http::parser::request request_type;
+    typedef websocketpp::http::parser::response response_type;
+
+    typedef websocketpp::message_buffer::message
+        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
+    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+
+    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
+
+    static const size_t max_message_size = 16000000;
+
+    /// Extension related config
+    static const bool enable_extensions = false;
+
+    /// Extension specific config
+
+    /// permessage_compress_config
+    struct permessage_deflate_config {
+        typedef stub_config::request_type request_type;
+    };
+
+    typedef websocketpp::extensions::permessage_deflate::disabled
+        <permessage_deflate_config> permessage_deflate_type;
+};
+
+BOOST_AUTO_TEST_CASE( exact_match ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK(!ec);
+
+    websocketpp::uri_ptr u;
+
+    u = p.get_uri(r);
+
+    BOOST_CHECK(u->get_valid());
+    BOOST_CHECK(!u->get_secure());
+    BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
+    BOOST_CHECK_EQUAL(u->get_resource(), "/");
+    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
+
+    p.process_handshake(r,"",response);
+
+    BOOST_CHECK_EQUAL(response.get_header("Connection"), "upgrade");
+    BOOST_CHECK_EQUAL(response.get_header("Upgrade"), "websocket");
+    BOOST_CHECK_EQUAL(response.get_header("Sec-WebSocket-Accept"), "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
+}
+
+BOOST_AUTO_TEST_CASE( non_get_method ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( ec == websocketpp::processor::error::invalid_http_method );
+}
+
+BOOST_AUTO_TEST_CASE( old_http_version ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( ec == websocketpp::processor::error::invalid_http_version );
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( ec == websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( ec == websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( bad_host ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi07<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( !ec );
+
+    BOOST_CHECK( !p.get_uri(r)->get_valid() );
+}
diff --git a/vendor/websocketpp/test/processors/hybi08.cpp b/vendor/websocketpp/test/processors/hybi08.cpp
new file mode 100644
index 0000000..b16b68e
--- /dev/null
+++ b/vendor/websocketpp/test/processors/hybi08.cpp
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE hybi_08_processor
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/processors/hybi08.hpp>
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+#include <websocketpp/message_buffer/message.hpp>
+#include <websocketpp/message_buffer/alloc.hpp>
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+#include <websocketpp/random/none.hpp>
+
+struct stub_config {
+    typedef websocketpp::http::parser::request request_type;
+    typedef websocketpp::http::parser::response response_type;
+
+    typedef websocketpp::message_buffer::message
+        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
+    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+
+    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
+
+    static const size_t max_message_size = 16000000;
+
+    /// Extension related config
+    static const bool enable_extensions = false;
+
+    /// Extension specific config
+
+    /// permessage_deflate_config
+    struct permessage_deflate_config {
+        typedef stub_config::request_type request_type;
+    };
+
+    typedef websocketpp::extensions::permessage_deflate::disabled
+        <permessage_deflate_config> permessage_deflate_type;
+};
+
+BOOST_AUTO_TEST_CASE( exact_match ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK(!ec);
+
+    websocketpp::uri_ptr u;
+
+    u = p.get_uri(r);
+
+    BOOST_CHECK(u->get_valid() == true);
+    BOOST_CHECK(u->get_secure() == false);
+    BOOST_CHECK(u->get_host() == "www.example.com");
+    BOOST_CHECK(u->get_resource() == "/");
+    BOOST_CHECK(u->get_port() == websocketpp::uri_default_port);
+
+    p.process_handshake(r,"",response);
+
+    BOOST_CHECK(response.get_header("Connection") == "upgrade");
+    BOOST_CHECK(response.get_header("Upgrade") == "websocket");
+    BOOST_CHECK(response.get_header("Sec-WebSocket-Accept") == "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
+}
+
+BOOST_AUTO_TEST_CASE( non_get_method ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::rng_type rng;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( ec == websocketpp::processor::error::invalid_http_method );
+}
+
+BOOST_AUTO_TEST_CASE( old_http_version ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( ec == websocketpp::processor::error::invalid_http_version );
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( ec == websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( ec == websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( bad_host ) {
+    stub_config::request_type r;
+    stub_config::response_type response;
+    stub_config::con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    websocketpp::processor::hybi08<stub_config> p(false,true,msg_manager,rng);
+    websocketpp::uri_ptr u;
+    websocketpp::lib::error_code ec;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == p.get_version());
+    ec = p.validate_handshake(r);
+    BOOST_CHECK( !ec );
+
+    u = p.get_uri(r);
+
+    BOOST_CHECK( !u->get_valid() );
+}
+
diff --git a/vendor/websocketpp/test/processors/hybi13.cpp b/vendor/websocketpp/test/processors/hybi13.cpp
new file mode 100644
index 0000000..9b2618a
--- /dev/null
+++ b/vendor/websocketpp/test/processors/hybi13.cpp
@@ -0,0 +1,693 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE hybi_13_processor
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/processors/hybi13.hpp>
+
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+#include <websocketpp/message_buffer/message.hpp>
+#include <websocketpp/message_buffer/alloc.hpp>
+#include <websocketpp/random/none.hpp>
+
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+struct stub_config {
+    typedef websocketpp::http::parser::request request_type;
+    typedef websocketpp::http::parser::response response_type;
+
+    typedef websocketpp::message_buffer::message
+        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
+    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+
+    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
+
+    struct permessage_deflate_config {
+        typedef stub_config::request_type request_type;
+    };
+
+    typedef websocketpp::extensions::permessage_deflate::disabled
+        <permessage_deflate_config> permessage_deflate_type;
+
+    static const size_t max_message_size = 16000000;
+    static const bool enable_extensions = false;
+};
+
+struct stub_config_ext {
+    typedef websocketpp::http::parser::request request_type;
+    typedef websocketpp::http::parser::response response_type;
+
+    typedef websocketpp::message_buffer::message
+        <websocketpp::message_buffer::alloc::con_msg_manager> message_type;
+    typedef websocketpp::message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+
+    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
+
+    struct permessage_deflate_config {
+        typedef stub_config_ext::request_type request_type;
+    };
+
+    typedef websocketpp::extensions::permessage_deflate::enabled
+        <permessage_deflate_config> permessage_deflate_type;
+
+    static const size_t max_message_size = 16000000;
+    static const bool enable_extensions = true;
+};
+
+typedef stub_config::con_msg_manager_type con_msg_manager_type;
+typedef stub_config::message_type::ptr message_ptr;
+
+// Set up a structure that constructs new copies of all of the support structure
+// for using connection processors
+struct processor_setup {
+    processor_setup(bool server)
+      : msg_manager(new con_msg_manager_type())
+      , p(false,server,msg_manager,rng) {}
+
+    websocketpp::lib::error_code ec;
+    con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    stub_config::request_type req;
+    stub_config::response_type res;
+    websocketpp::processor::hybi13<stub_config> p;
+};
+
+struct processor_setup_ext {
+    processor_setup_ext(bool server)
+      : msg_manager(new con_msg_manager_type())
+      , p(false,server,msg_manager,rng) {}
+
+    websocketpp::lib::error_code ec;
+    con_msg_manager_type::ptr msg_manager;
+    stub_config::rng_type rng;
+    stub_config::request_type req;
+    stub_config::response_type res;
+    websocketpp::processor::hybi13<stub_config_ext> p;
+};
+
+BOOST_AUTO_TEST_CASE( exact_match ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    BOOST_CHECK(!env.p.validate_handshake(env.req));
+
+    websocketpp::uri_ptr u;
+
+    BOOST_CHECK_NO_THROW( u = env.p.get_uri(env.req) );
+
+    BOOST_CHECK_EQUAL(u->get_secure(), false);
+    BOOST_CHECK_EQUAL(u->get_host(), "www.example.com");
+    BOOST_CHECK_EQUAL(u->get_resource(), "/");
+    BOOST_CHECK_EQUAL(u->get_port(), websocketpp::uri_default_port);
+
+    env.p.process_handshake(env.req,"",env.res);
+
+    BOOST_CHECK_EQUAL(env.res.get_header("Connection"), "upgrade");
+    BOOST_CHECK_EQUAL(env.res.get_header("Upgrade"), "websocket");
+    BOOST_CHECK_EQUAL(env.res.get_header("Sec-WebSocket-Accept"), "s3pPLMBiTxaQ9kYGzzhZRbK+xOo=");
+}
+
+BOOST_AUTO_TEST_CASE( non_get_method ) {
+    processor_setup env(true);
+
+    std::string handshake = "POST / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    BOOST_CHECK( env.p.validate_handshake(env.req) == websocketpp::processor::error::invalid_http_method );
+}
+
+BOOST_AUTO_TEST_CASE( old_http_version ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.0\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(env.req));
+    BOOST_CHECK_EQUAL(websocketpp::processor::get_websocket_version(env.req), env.p.get_version());
+    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::invalid_http_version );
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
+    BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
+    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
+    BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
+    BOOST_CHECK_EQUAL( env.p.validate_handshake(env.req), websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( bad_host ) {
+    processor_setup env(true);
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com:70000\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: foo\r\n\r\n";
+
+    env.req.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK( websocketpp::processor::is_websocket_handshake(env.req) );
+    BOOST_CHECK_EQUAL( websocketpp::processor::get_websocket_version(env.req), env.p.get_version() );
+    BOOST_CHECK( !env.p.validate_handshake(env.req) );
+    BOOST_CHECK( !env.p.get_uri(env.req)->get_valid() );
+}
+
+// FRAME TESTS TO DO
+//
+// unmasked, 0 length, binary
+// 0x82 0x00
+//
+// masked, 0 length, binary
+// 0x82 0x80
+//
+// unmasked, 0 length, text
+// 0x81 0x00
+//
+// masked, 0 length, text
+// 0x81 0x80
+
+BOOST_AUTO_TEST_CASE( frame_empty_binary_unmasked ) {
+    uint8_t frame[2] = {0x82, 0x00};
+
+    // all in one chunk
+    processor_setup env1(false);
+
+    size_t ret1 = env1.p.consume(frame,2,env1.ec);
+
+    BOOST_CHECK_EQUAL( ret1, 2 );
+    BOOST_CHECK( !env1.ec );
+    BOOST_CHECK_EQUAL( env1.p.ready(), true );
+
+    // two separate chunks
+    processor_setup env2(false);
+
+    BOOST_CHECK_EQUAL( env2.p.consume(frame,1,env2.ec), 1 );
+    BOOST_CHECK( !env2.ec );
+    BOOST_CHECK_EQUAL( env2.p.ready(), false );
+
+    BOOST_CHECK_EQUAL( env2.p.consume(frame+1,1,env2.ec), 1 );
+    BOOST_CHECK( !env2.ec );
+    BOOST_CHECK_EQUAL( env2.p.ready(), true );
+}
+
+BOOST_AUTO_TEST_CASE( frame_small_binary_unmasked ) {
+    processor_setup env(false);
+
+    uint8_t frame[4] = {0x82, 0x02, 0x2A, 0x2A};
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env.p.consume(frame,4,env.ec), 4 );
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( env.p.ready(), true );
+
+    message_ptr foo = env.p.get_message();
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( foo->get_payload(), "**" );
+
+}
+
+BOOST_AUTO_TEST_CASE( frame_extended_binary_unmasked ) {
+    processor_setup env(false);
+
+    uint8_t frame[130] = {0x82, 0x7E, 0x00, 0x7E};
+    frame[0] = 0x82;
+    frame[1] = 0x7E;
+    frame[2] = 0x00;
+    frame[3] = 0x7E;
+    std::fill_n(frame+4,126,0x2A);
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env.p.consume(frame,130,env.ec), 130 );
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( env.p.ready(), true );
+
+    message_ptr foo = env.p.get_message();
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( foo->get_payload().size(), 126 );
+}
+
+BOOST_AUTO_TEST_CASE( frame_jumbo_binary_unmasked ) {
+    processor_setup env(false);
+
+    uint8_t frame[130] = {0x82, 0x7E, 0x00, 0x7E};
+    std::fill_n(frame+4,126,0x2A);
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env.p.consume(frame,130,env.ec), 130 );
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( env.p.ready(), true );
+
+    message_ptr foo = env.p.get_message();
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( foo->get_payload().size(), 126 );
+}
+
+BOOST_AUTO_TEST_CASE( control_frame_too_large ) {
+    processor_setup env(false);
+
+    uint8_t frame[130] = {0x88, 0x7E, 0x00, 0x7E};
+    std::fill_n(frame+4,126,0x2A);
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_GT( env.p.consume(frame,130,env.ec), 0 );
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::control_too_big  );
+    BOOST_CHECK_EQUAL( env.p.ready(), false );
+}
+
+BOOST_AUTO_TEST_CASE( rsv_bits_used ) {
+    uint8_t frame[3][2] = {{0x90, 0x00},
+                           {0xA0, 0x00},
+                           {0xC0, 0x00}};
+
+    for (int i = 0; i < 3; i++) {
+        processor_setup env(false);
+
+        BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+        BOOST_CHECK_GT( env.p.consume(frame[i],2,env.ec), 0 );
+        BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_rsv_bit  );
+        BOOST_CHECK_EQUAL( env.p.ready(), false );
+    }
+}
+
+
+BOOST_AUTO_TEST_CASE( reserved_opcode_used ) {
+    uint8_t frame[10][2] = {{0x83, 0x00},
+                            {0x84, 0x00},
+                            {0x85, 0x00},
+                            {0x86, 0x00},
+                            {0x87, 0x00},
+                            {0x8B, 0x00},
+                            {0x8C, 0x00},
+                            {0x8D, 0x00},
+                            {0x8E, 0x00},
+                            {0x8F, 0x00}};
+
+    for (int i = 0; i < 10; i++) {
+        processor_setup env(false);
+
+        BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+        BOOST_CHECK_GT( env.p.consume(frame[i],2,env.ec), 0 );
+        BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode  );
+        BOOST_CHECK_EQUAL( env.p.ready(), false );
+    }
+}
+
+BOOST_AUTO_TEST_CASE( fragmented_control_message ) {
+    processor_setup env(false);
+
+    uint8_t frame[2] = {0x08, 0x00};
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_GT( env.p.consume(frame,2,env.ec), 0 );
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::fragmented_control );
+    BOOST_CHECK_EQUAL( env.p.ready(), false );
+}
+
+BOOST_AUTO_TEST_CASE( fragmented_binary_message ) {
+    processor_setup env0(false);
+    processor_setup env1(false);
+
+    uint8_t frame0[6] = {0x02, 0x01, 0x2A, 0x80, 0x01, 0x2A};
+    uint8_t frame1[8] = {0x02, 0x01, 0x2A, 0x89, 0x00, 0x80, 0x01, 0x2A};
+
+    // read fragmented message in one chunk
+    BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env0.p.consume(frame0,6,env0.ec), 6 );
+    BOOST_CHECK( !env0.ec );
+    BOOST_CHECK_EQUAL( env0.p.ready(), true );
+    BOOST_CHECK_EQUAL( env0.p.get_message()->get_payload(), "**" );
+
+    // read fragmented message in two chunks
+    BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env0.p.consume(frame0,3,env0.ec), 3 );
+    BOOST_CHECK( !env0.ec );
+    BOOST_CHECK_EQUAL( env0.p.ready(), false );
+    BOOST_CHECK_EQUAL( env0.p.consume(frame0+3,3,env0.ec), 3 );
+    BOOST_CHECK( !env0.ec );
+    BOOST_CHECK_EQUAL( env0.p.ready(), true );
+    BOOST_CHECK_EQUAL( env0.p.get_message()->get_payload(), "**" );
+
+    // read fragmented message with control message in between
+    BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env0.p.consume(frame1,8,env0.ec), 5 );
+    BOOST_CHECK( !env0.ec );
+    BOOST_CHECK_EQUAL( env0.p.ready(), true );
+    BOOST_CHECK_EQUAL( env0.p.get_message()->get_opcode(), websocketpp::frame::opcode::PING);
+    BOOST_CHECK_EQUAL( env0.p.consume(frame1+5,3,env0.ec), 3 );
+    BOOST_CHECK( !env0.ec );
+    BOOST_CHECK_EQUAL( env0.p.ready(), true );
+    BOOST_CHECK_EQUAL( env0.p.get_message()->get_payload(), "**" );
+
+    // read lone continuation frame
+    BOOST_CHECK_EQUAL( env0.p.get_message(), message_ptr() );
+    BOOST_CHECK_GT( env0.p.consume(frame0+3,3,env0.ec), 0);
+    BOOST_CHECK_EQUAL( env0.ec, websocketpp::processor::error::invalid_continuation );
+
+    // read two start frames in a row
+    BOOST_CHECK_EQUAL( env1.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env1.p.consume(frame0,3,env1.ec), 3);
+    BOOST_CHECK( !env1.ec );
+    BOOST_CHECK_GT( env1.p.consume(frame0,3,env1.ec), 0);
+    BOOST_CHECK_EQUAL( env1.ec, websocketpp::processor::error::invalid_continuation );
+}
+
+BOOST_AUTO_TEST_CASE( unmasked_client_frame ) {
+    processor_setup env(true);
+
+    uint8_t frame[2] = {0x82, 0x00};
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_GT( env.p.consume(frame,2,env.ec), 0 );
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::masking_required );
+    BOOST_CHECK_EQUAL( env.p.ready(), false );
+}
+
+BOOST_AUTO_TEST_CASE( masked_server_frame ) {
+    processor_setup env(false);
+
+    uint8_t frame[8] = {0x82, 0x82, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0xD5};
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_GT( env.p.consume(frame,8,env.ec), 0 );
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::masking_forbidden );
+    BOOST_CHECK_EQUAL( env.p.ready(), false );
+}
+
+BOOST_AUTO_TEST_CASE( frame_small_binary_masked ) {
+    processor_setup env(true);
+
+    uint8_t frame[8] = {0x82, 0x82, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0xD5};
+
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env.p.consume(frame,8,env.ec), 8 );
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( env.p.ready(), true );
+    BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "**" );
+}
+
+BOOST_AUTO_TEST_CASE( masked_fragmented_binary_message ) {
+    processor_setup env(true);
+
+    uint8_t frame0[14] = {0x02, 0x81, 0xAB, 0x23, 0x98, 0x45, 0x81,
+                         0x80, 0x81, 0xB8, 0x34, 0x12, 0xFF, 0x92};
+
+    // read fragmented message in one chunk
+    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
+    BOOST_CHECK_EQUAL( env.p.consume(frame0,14,env.ec), 14 );
+    BOOST_CHECK( !env.ec );
+    BOOST_CHECK_EQUAL( env.p.ready(), true );
+    BOOST_CHECK_EQUAL( env.p.get_message()->get_payload(), "**" );
+}
+
+BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
+    processor_setup env(true);
+
+    message_ptr in = env.msg_manager->get_message();
+    message_ptr out = env.msg_manager->get_message();
+    message_ptr invalid;
+
+    // empty pointers arguements should return sane error
+    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,invalid), websocketpp::processor::error::invalid_arguments );
+
+    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(in,invalid), websocketpp::processor::error::invalid_arguments );
+
+    BOOST_CHECK_EQUAL( env.p.prepare_data_frame(invalid,out), websocketpp::processor::error::invalid_arguments );
+
+    // test valid opcodes
+    // control opcodes should return an error, data ones shouldn't
+    for (int i = 0; i < 0xF; i++) {
+        in->set_opcode(websocketpp::frame::opcode::value(i));
+
+        env.ec = env.p.prepare_data_frame(in,out);
+
+        if (websocketpp::frame::opcode::is_control(in->get_opcode())) {
+            BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::invalid_opcode );
+        } else {
+            BOOST_CHECK_NE( env.ec, websocketpp::processor::error::invalid_opcode );
+        }
+    }
+
+
+    //in.set_payload("foo");
+
+    //e = prepare_data_frame(in,out);
+
+
+}
+
+BOOST_AUTO_TEST_CASE( single_frame_message_too_large ) {
+    processor_setup env(true);
+    
+    env.p.set_max_message_size(3);
+    
+    uint8_t frame0[10] = {0x82, 0x84, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01};
+
+    // read message that is one byte too large
+    BOOST_CHECK_EQUAL( env.p.consume(frame0,10,env.ec), 6 );
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::message_too_big );
+}
+
+BOOST_AUTO_TEST_CASE( multiple_frame_message_too_large ) {
+    processor_setup env(true);
+    
+    env.p.set_max_message_size(4);
+    
+    uint8_t frame0[8] = {0x02, 0x82, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01};
+    uint8_t frame1[9] = {0x80, 0x83, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01};
+
+    // read first message frame with size under the limit
+    BOOST_CHECK_EQUAL( env.p.consume(frame0,8,env.ec), 8 );
+    BOOST_CHECK( !env.ec );
+    
+    // read second message frame that puts the size over the limit
+    BOOST_CHECK_EQUAL( env.p.consume(frame1,9,env.ec), 6 );
+    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::message_too_big );
+}
+
+
+
+BOOST_AUTO_TEST_CASE( client_handshake_request ) {
+    processor_setup env(false);
+
+    websocketpp::uri_ptr u(new websocketpp::uri("ws://localhost/"));
+
+    env.p.client_handshake_request(env.req,u, std::vector<std::string>());
+
+    BOOST_CHECK_EQUAL( env.req.get_method(), "GET" );
+    BOOST_CHECK_EQUAL( env.req.get_version(), "HTTP/1.1");
+    BOOST_CHECK_EQUAL( env.req.get_uri(), "/");
+
+    BOOST_CHECK_EQUAL( env.req.get_header("Host"), "localhost");
+    BOOST_CHECK_EQUAL( env.req.get_header("Sec-WebSocket-Version"), "13");
+    BOOST_CHECK_EQUAL( env.req.get_header("Connection"), "Upgrade");
+    BOOST_CHECK_EQUAL( env.req.get_header("Upgrade"), "websocket");
+}
+
+// TODO:
+// test cases
+// - adding headers
+// - adding Upgrade header
+// - adding Connection header
+// - adding Sec-WebSocket-Version, Sec-WebSocket-Key, or Host header
+// - other Sec* headers?
+// - User Agent header?
+
+// Origin support
+// Subprotocol requests
+
+//websocketpp::uri_ptr u(new websocketpp::uri("ws://localhost/"));
+    //env.p.client_handshake_request(env.req,u);
+
+BOOST_AUTO_TEST_CASE( client_handshake_response_404 ) {
+    processor_setup env(false);
+
+    std::string res = "HTTP/1.1 404 Not Found\r\n\r\n";
+    env.res.consume(res.data(),res.size());
+
+    BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::invalid_http_status );
+}
+
+BOOST_AUTO_TEST_CASE( client_handshake_response_no_upgrade ) {
+    processor_setup env(false);
+
+    std::string res = "HTTP/1.1 101 Switching Protocols\r\n\r\n";
+    env.res.consume(res.data(),res.size());
+
+    BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( client_handshake_response_no_connection ) {
+    processor_setup env(false);
+
+    std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\n\r\n";
+    env.res.consume(res.data(),res.size());
+
+    BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( client_handshake_response_no_accept ) {
+    processor_setup env(false);
+
+    std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\nConnection: bar, UpGrAdE\r\n\r\n";
+    env.res.consume(res.data(),res.size());
+
+    BOOST_CHECK_EQUAL( env.p.validate_server_handshake_response(env.req,env.res), websocketpp::processor::error::missing_required_header );
+}
+
+BOOST_AUTO_TEST_CASE( client_handshake_response ) {
+    processor_setup env(false);
+
+    env.req.append_header("Sec-WebSocket-Key", "dGhlIHNhbXBsZSBub25jZQ==");
+
+    std::string res = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: foo, wEbsOckEt\r\nConnection: bar, UpGrAdE\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\n\r\n";
+    env.res.consume(res.data(),res.size());
+
+    BOOST_CHECK( !env.p.validate_server_handshake_response(env.req,env.res) );
+}
+
+BOOST_AUTO_TEST_CASE( extensions_disabled ) {
+    processor_setup env(true);
+
+    env.req.replace_header("Sec-WebSocket-Extensions","");
+
+    std::pair<websocketpp::lib::error_code,std::string> neg_results;
+    neg_results = env.p.negotiate_extensions(env.req);
+
+    BOOST_CHECK_EQUAL( neg_results.first, websocketpp::processor::error::extensions_disabled );
+    BOOST_CHECK_EQUAL( neg_results.second, "" );
+}
+
+BOOST_AUTO_TEST_CASE( extension_negotiation_blank ) {
+    processor_setup_ext env(true);
+
+    env.req.replace_header("Sec-WebSocket-Extensions","");
+
+    std::pair<websocketpp::lib::error_code,std::string> neg_results;
+    neg_results = env.p.negotiate_extensions(env.req);
+
+    BOOST_CHECK( !neg_results.first );
+    BOOST_CHECK_EQUAL( neg_results.second, "" );
+}
+
+BOOST_AUTO_TEST_CASE( extension_negotiation_unknown ) {
+    processor_setup_ext env(true);
+
+    env.req.replace_header("Sec-WebSocket-Extensions","foo");
+
+    std::pair<websocketpp::lib::error_code,std::string> neg_results;
+    neg_results = env.p.negotiate_extensions(env.req);
+
+    BOOST_CHECK( !neg_results.first );
+    BOOST_CHECK_EQUAL( neg_results.second, "" );
+}
+
+BOOST_AUTO_TEST_CASE( extract_subprotocols_empty ) {
+    processor_setup env(true);
+    std::vector<std::string> subps;
+
+    BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
+    BOOST_CHECK_EQUAL( subps.size(), 0 );
+}
+
+BOOST_AUTO_TEST_CASE( extract_subprotocols_one ) {
+    processor_setup env(true);
+    std::vector<std::string> subps;
+
+    env.req.replace_header("Sec-WebSocket-Protocol","foo");
+
+    BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
+    BOOST_REQUIRE_EQUAL( subps.size(), 1 );
+    BOOST_CHECK_EQUAL( subps[0], "foo" );
+}
+
+BOOST_AUTO_TEST_CASE( extract_subprotocols_multiple ) {
+    processor_setup env(true);
+    std::vector<std::string> subps;
+
+    env.req.replace_header("Sec-WebSocket-Protocol","foo,bar");
+
+    BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
+    BOOST_REQUIRE_EQUAL( subps.size(), 2 );
+    BOOST_CHECK_EQUAL( subps[0], "foo" );
+    BOOST_CHECK_EQUAL( subps[1], "bar" );
+}
+
+BOOST_AUTO_TEST_CASE( extract_subprotocols_invalid) {
+    processor_setup env(true);
+    std::vector<std::string> subps;
+
+    env.req.replace_header("Sec-WebSocket-Protocol","foo,bar,,,,");
+
+    BOOST_CHECK_EQUAL( env.p.extract_subprotocols(env.req,subps), websocketpp::processor::error::make_error_code(websocketpp::processor::error::subprotocol_parse_error) );
+    BOOST_CHECK_EQUAL( subps.size(), 0 );
+}
+
+BOOST_AUTO_TEST_CASE( extension_negotiation_permessage_deflate ) {
+    processor_setup_ext env(true);
+
+    env.req.replace_header("Sec-WebSocket-Extensions",
+        "permessage-deflate; client_max_window_bits");
+
+    std::pair<websocketpp::lib::error_code,std::string> neg_results;
+    neg_results = env.p.negotiate_extensions(env.req);
+
+    BOOST_CHECK( !neg_results.first );
+    BOOST_CHECK_EQUAL( neg_results.second, "permessage-deflate" );
+}
+
diff --git a/vendor/websocketpp/test/processors/processor.cpp b/vendor/websocketpp/test/processors/processor.cpp
new file mode 100644
index 0000000..0505646
--- /dev/null
+++ b/vendor/websocketpp/test/processors/processor.cpp
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE processors
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/processors/processor.hpp>
+#include <websocketpp/http/request.hpp>
+
+BOOST_AUTO_TEST_CASE( exact_match ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( non_match ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(!websocketpp::processor::is_websocket_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( ci_exact_match ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: UpGrAde\r\nUpgrade: WebSocket\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( non_exact_match1 ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade,foo\r\nUpgrade: websocket,foo\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( non_exact_match2 ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: keep-alive,Upgrade,foo\r\nUpgrade: foo,websocket,bar\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::is_websocket_handshake(r));
+}
+
+BOOST_AUTO_TEST_CASE( version_blank ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 0);
+}
+
+BOOST_AUTO_TEST_CASE( version_7 ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 7\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 7);
+}
+
+BOOST_AUTO_TEST_CASE( version_8 ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 8\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 8);
+}
+
+BOOST_AUTO_TEST_CASE( version_13 ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == 13);
+}
+
+BOOST_AUTO_TEST_CASE( version_non_numeric ) {
+    websocketpp::http::parser::request r;
+
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nUpgrade: websocket\r\nSec-WebSocket-Version: abc\r\n\r\n";
+
+    r.consume(handshake.c_str(),handshake.size());
+
+    BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == -1);
+}
\ No newline at end of file
diff --git a/vendor/websocketpp/test/random/CMakeLists.txt b/vendor/websocketpp/test/random/CMakeLists.txt
new file mode 100644
index 0000000..1fd459d
--- /dev/null
+++ b/vendor/websocketpp/test/random/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Test RNG policy none
+file (GLOB SOURCE none.cpp)
+
+init_target (test_random_none)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test RNG policy random_device
+file (GLOB SOURCE random_device.cpp)
+
+init_target (test_random_random_device)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/vendor/websocketpp/test/random/SConscript b/vendor/websocketpp/test/random/SConscript
new file mode 100644
index 0000000..3cadc9e
--- /dev/null
+++ b/vendor/websocketpp/test/random/SConscript
@@ -0,0 +1,27 @@
+## random number generation unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','random','system'],env) + [platform_libs]
+
+objs = env.Object('random_none_boost.o', ["none.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('random_device_boost.o', ["random_device.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_random_none_boost', ["random_none_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_random_device_boost', ["random_device_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   objs += env_cpp11.Object('random_none_stl.o', ["none.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('random_device_stl.o', ["random_device.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_random_none_stl', ["random_none_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_random_device_stl', ["random_device_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/random/none.cpp b/vendor/websocketpp/test/random/none.cpp
new file mode 100644
index 0000000..b27b239
--- /dev/null
+++ b/vendor/websocketpp/test/random/none.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE random_none
+#include <boost/test/unit_test.hpp>
+
+#include <websocketpp/common/stdint.hpp>
+#include <websocketpp/random/none.hpp>
+
+BOOST_AUTO_TEST_CASE( does_it_compile ) {
+    websocketpp::random::none::int_generator<int32_t> rng;
+
+    int32_t foo = rng();
+
+    BOOST_CHECK( foo == 0 );
+}
diff --git a/vendor/websocketpp/test/random/random_device.cpp b/vendor/websocketpp/test/random/random_device.cpp
new file mode 100644
index 0000000..b3ce3a5
--- /dev/null
+++ b/vendor/websocketpp/test/random/random_device.cpp
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE random_device
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+#include <websocketpp/common/stdint.hpp>
+#include <websocketpp/random/random_device.hpp>
+#include <websocketpp/concurrency/none.hpp>
+
+BOOST_AUTO_TEST_CASE( compiles ) {
+    websocketpp::random::random_device::int_generator<int32_t,websocketpp::concurrency::none> rng;
+
+    bool e = false;
+
+    try {
+        int32_t foo = rng();
+        std::cout << foo << std::endl;
+    } catch (...) {
+        e = true;
+    }
+
+    BOOST_CHECK( e == false );
+}
diff --git a/vendor/websocketpp/test/roles/CMakeLists.txt b/vendor/websocketpp/test/roles/CMakeLists.txt
new file mode 100644
index 0000000..5d41137
--- /dev/null
+++ b/vendor/websocketpp/test/roles/CMakeLists.txt
@@ -0,0 +1,17 @@
+# Test client role
+file (GLOB SOURCE client.cpp)
+
+init_target (test_roles_client)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test server role
+file (GLOB SOURCE server.cpp)
+
+init_target (test_roles_server)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/vendor/websocketpp/test/roles/SConscript b/vendor/websocketpp/test/roles/SConscript
new file mode 100644
index 0000000..e86107e
--- /dev/null
+++ b/vendor/websocketpp/test/roles/SConscript
@@ -0,0 +1,27 @@
+## role unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system','random'],env) + [platform_libs]
+
+objs = env.Object('client_boost.o', ["client.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('server_boost.o', ["server.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_client_boost', ["client_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_server_boost', ["server_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   objs += env_cpp11.Object('client_stl.o', ["client.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('server_stl.o', ["server.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_client_stl', ["client_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_server_stl', ["server_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/roles/client.cpp b/vendor/websocketpp/test/roles/client.cpp
new file mode 100644
index 0000000..9aab3ee
--- /dev/null
+++ b/vendor/websocketpp/test/roles/client.cpp
@@ -0,0 +1,194 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE client
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+#include <websocketpp/random/random_device.hpp>
+
+#include <websocketpp/config/core.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/http/request.hpp>
+
+struct stub_config : public websocketpp::config::core {
+    typedef core::concurrency_type concurrency_type;
+
+    typedef core::request_type request_type;
+    typedef core::response_type response_type;
+
+    typedef core::message_type message_type;
+    typedef core::con_msg_manager_type con_msg_manager_type;
+    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef core::alog_type alog_type;
+    typedef core::elog_type elog_type;
+
+    //typedef core::rng_type rng_type;
+    typedef websocketpp::random::random_device::int_generator<uint32_t,concurrency_type> rng_type;
+
+    typedef core::transport_type transport_type;
+
+    typedef core::endpoint_base endpoint_base;
+
+    static const websocketpp::log::level elog_level = websocketpp::log::elevel::none;
+    static const websocketpp::log::level alog_level = websocketpp::log::alevel::none;
+};
+
+typedef websocketpp::client<stub_config> client;
+typedef client::connection_ptr connection_ptr;
+
+BOOST_AUTO_TEST_CASE( invalid_uri ) {
+    client c;
+    websocketpp::lib::error_code ec;
+
+    connection_ptr con = c.get_connection("foo", ec);
+
+    BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::invalid_uri) );
+}
+
+BOOST_AUTO_TEST_CASE( unsecure_endpoint ) {
+    client c;
+    websocketpp::lib::error_code ec;
+
+    connection_ptr con = c.get_connection("wss://localhost/", ec);
+
+    BOOST_CHECK_EQUAL( ec , websocketpp::error::make_error_code(websocketpp::error::endpoint_not_secure) );
+}
+
+BOOST_AUTO_TEST_CASE( get_connection ) {
+    client c;
+    websocketpp::lib::error_code ec;
+
+    connection_ptr con = c.get_connection("ws://localhost/", ec);
+
+    BOOST_CHECK( con );
+    BOOST_CHECK_EQUAL( con->get_host() , "localhost" );
+    BOOST_CHECK_EQUAL( con->get_port() , 80 );
+    BOOST_CHECK_EQUAL( con->get_secure() , false );
+    BOOST_CHECK_EQUAL( con->get_resource() , "/" );
+}
+
+BOOST_AUTO_TEST_CASE( connect_con ) {
+    client c;
+    websocketpp::lib::error_code ec;
+    std::stringstream out;
+    std::string o;
+
+    c.register_ostream(&out);
+
+    connection_ptr con = c.get_connection("ws://localhost/", ec);
+    c.connect(con);
+
+    o = out.str();
+    websocketpp::http::parser::request r;
+    r.consume(o.data(),o.size());
+
+    BOOST_CHECK( r.ready() );
+    BOOST_CHECK_EQUAL( r.get_method(), "GET");
+    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1");
+    BOOST_CHECK_EQUAL( r.get_uri(), "/");
+
+    BOOST_CHECK_EQUAL( r.get_header("Host"), "localhost");
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Version"), "13");
+    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade");
+    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket");
+
+    // Key is randomly generated & User-Agent will change so just check that
+    // they are not empty.
+    BOOST_CHECK_NE( r.get_header("Sec-WebSocket-Key"), "");
+    BOOST_CHECK_NE( r.get_header("User-Agent"), "" );
+
+    // connection should have written out an opening handshake request and be in
+    // the read response internal state
+
+    // TODO: more tests related to reading the HTTP response
+    std::stringstream channel2;
+    channel2 << "e\r\n\r\n";
+    channel2 >> *con;
+}
+
+BOOST_AUTO_TEST_CASE( select_subprotocol ) {
+    client c;
+    websocketpp::lib::error_code ec;
+    using websocketpp::error::make_error_code;
+
+    connection_ptr con = c.get_connection("ws://localhost/", ec);
+
+    BOOST_CHECK( con );
+
+    con->select_subprotocol("foo",ec);
+    BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::server_only) );
+    BOOST_CHECK_THROW( con->select_subprotocol("foo") , websocketpp::exception );
+}
+
+BOOST_AUTO_TEST_CASE( add_subprotocols_invalid ) {
+    client c;
+    websocketpp::lib::error_code ec;
+    using websocketpp::error::make_error_code;
+
+    connection_ptr con = c.get_connection("ws://localhost/", ec);
+    BOOST_CHECK( con );
+
+    con->add_subprotocol("",ec);
+    BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
+    BOOST_CHECK_THROW( con->add_subprotocol("") , websocketpp::exception );
+
+    con->add_subprotocol("foo,bar",ec);
+    BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
+    BOOST_CHECK_THROW( con->add_subprotocol("foo,bar") , websocketpp::exception );
+}
+
+BOOST_AUTO_TEST_CASE( add_subprotocols ) {
+    client c;
+    websocketpp::lib::error_code ec;
+    std::stringstream out;
+    std::string o;
+
+    c.register_ostream(&out);
+
+    connection_ptr con = c.get_connection("ws://localhost/", ec);
+    BOOST_CHECK( con );
+
+    con->add_subprotocol("foo",ec);
+    BOOST_CHECK( !ec );
+
+    BOOST_CHECK_NO_THROW( con->add_subprotocol("bar") );
+
+    c.connect(con);
+
+    o = out.str();
+    websocketpp::http::parser::request r;
+    r.consume(o.data(),o.size());
+
+    BOOST_CHECK( r.ready() );
+    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "foo, bar");
+}
+
+
diff --git a/vendor/websocketpp/test/roles/server.cpp b/vendor/websocketpp/test/roles/server.cpp
new file mode 100644
index 0000000..ef24bfc
--- /dev/null
+++ b/vendor/websocketpp/test/roles/server.cpp
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE server
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+// Test Environment:
+// server, no TLS, no locks, iostream based transport
+#include <websocketpp/config/core.hpp>
+#include <websocketpp/server.hpp>
+
+typedef websocketpp::server<websocketpp::config::core> server;
+typedef websocketpp::config::core::message_type::ptr message_ptr;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+/*struct stub_config : public websocketpp::config::core {
+    typedef core::concurrency_type concurrency_type;
+
+    typedef core::request_type request_type;
+    typedef core::response_type response_type;
+
+    typedef core::message_type message_type;
+    typedef core::con_msg_manager_type con_msg_manager_type;
+    typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef core::alog_type alog_type;
+    typedef core::elog_type elog_type;
+
+    typedef core::rng_type rng_type;
+
+    typedef core::transport_type transport_type;
+
+    typedef core::endpoint_base endpoint_base;
+};*/
+
+/* Run server and return output test rig */
+std::string run_server_test(server& s, std::string input) {
+    server::connection_ptr con;
+    std::stringstream output;
+
+    s.register_ostream(&output);
+    s.clear_access_channels(websocketpp::log::alevel::all);
+    s.clear_error_channels(websocketpp::log::elevel::all);
+
+    con = s.get_connection();
+    con->start();
+
+    std::stringstream channel;
+
+    channel << input;
+    channel >> *con;
+
+    return output.str();
+}
+
+/* handler library*/
+void echo_func(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
+    s->send(hdl, msg->get_payload(), msg->get_opcode());
+}
+
+bool validate_func_subprotocol(server* s, std::string* out, std::string accept,
+    websocketpp::connection_hdl hdl)
+{
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+
+    std::stringstream o;
+
+    const std::vector<std::string> & protocols = con->get_requested_subprotocols();
+    std::vector<std::string>::const_iterator it;
+
+    for (it = protocols.begin(); it != protocols.end(); ++it) {
+        o << *it << ",";
+    }
+
+    *out = o.str();
+
+    if (!accept.empty()) {
+        con->select_subprotocol(accept);
+    }
+
+    return true;
+}
+
+void open_func_subprotocol(server* s, std::string* out, websocketpp::connection_hdl hdl) {
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+
+    *out = con->get_subprotocol();
+}
+
+/* Tests */
+BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
+
+    server s;
+    s.set_user_agent("test");
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( invalid_websocket_version ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: a\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+    std::string output = "HTTP/1.1 400 Bad Request\r\nServer: test\r\n\r\n";
+
+    server s;
+    s.set_user_agent("test");
+    //s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( unimplemented_websocket_version ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 14\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
+
+    std::string output = "HTTP/1.1 400 Bad Request\r\nSec-WebSocket-Version: 0,7,8,13\r\nServer: test\r\n\r\n";
+
+    server s;
+    s.set_user_agent("test");
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+}
+
+BOOST_AUTO_TEST_CASE( list_subprotocol_empty ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
+
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
+
+    std::string subprotocol;
+
+    server s;
+    s.set_user_agent("test");
+    s.set_open_handler(bind(&open_func_subprotocol,&s,&subprotocol,::_1));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+    BOOST_CHECK_EQUAL(subprotocol, "");
+}
+
+BOOST_AUTO_TEST_CASE( list_subprotocol_one ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
+
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
+
+    std::string validate;
+    std::string open;
+
+    server s;
+    s.set_user_agent("test");
+    s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"",::_1));
+    s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+    BOOST_CHECK_EQUAL(validate, "foo,");
+    BOOST_CHECK_EQUAL(open, "");
+}
+
+BOOST_AUTO_TEST_CASE( accept_subprotocol_one ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
+
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: foo\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
+
+    std::string validate;
+    std::string open;
+
+    server s;
+    s.set_user_agent("test");
+    s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"foo",::_1));
+    s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+    BOOST_CHECK_EQUAL(validate, "foo,");
+    BOOST_CHECK_EQUAL(open, "foo");
+}
+
+BOOST_AUTO_TEST_CASE( accept_subprotocol_invalid ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo\r\n\r\n";
+
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: foo\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
+
+    std::string validate;
+    std::string open;
+
+    server s;
+    s.set_user_agent("test");
+    s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"foo2",::_1));
+    s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
+
+    std::string o;
+
+    BOOST_CHECK_THROW(o = run_server_test(s,input), websocketpp::exception);
+}
+
+BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\nSec-WebSocket-Protocol: foo, bar\r\n\r\n";
+
+    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nSec-WebSocket-Protocol: bar\r\nServer: test\r\nUpgrade: websocket\r\n\r\n";
+
+    std::string validate;
+    std::string open;
+
+    server s;
+    s.set_user_agent("test");
+    s.set_validate_handler(bind(&validate_func_subprotocol,&s,&validate,"bar",::_1));
+    s.set_open_handler(bind(&open_func_subprotocol,&s,&open,::_1));
+
+    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
+    BOOST_CHECK_EQUAL(validate, "foo,bar,");
+    BOOST_CHECK_EQUAL(open, "bar");
+}
+
+/*BOOST_AUTO_TEST_CASE( user_reject_origin ) {
+    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example2.com\r\n\r\n";
+    std::string output = "HTTP/1.1 403 Forbidden\r\nServer: test\r\n\r\n";
+
+    server s;
+    s.set_user_agent("test");
+
+    BOOST_CHECK(run_server_test(s,input) == output);
+}*/
diff --git a/vendor/websocketpp/test/transport/CMakeLists.txt b/vendor/websocketpp/test/transport/CMakeLists.txt
new file mode 100644
index 0000000..6b44d98
--- /dev/null
+++ b/vendor/websocketpp/test/transport/CMakeLists.txt
@@ -0,0 +1,71 @@
+if (OPENSSL_FOUND)
+
+# Test transport integration
+file (GLOB SOURCE integration.cpp)
+
+init_target (test_transport)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+link_openssl()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test transport asio timers
+file (GLOB SOURCE asio/timers.cpp)
+
+init_target (test_transport_asio_timers)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+link_openssl()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test transport asio security
+file (GLOB SOURCE asio/security.cpp)
+
+init_target (test_transport_asio_security)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+link_openssl()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+endif()
+
+# Test transport iostream base
+file (GLOB SOURCE iostream/base.cpp)
+
+init_target (test_transport_iostream_base)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test transport iostream endpoint
+file (GLOB SOURCE iostream/endpoint.cpp)
+
+init_target (test_transport_iostream_endpoint)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test transport iostream connection
+file (GLOB SOURCE iostream/connection.cpp)
+
+init_target (test_transport_iostream_connection)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test transport asio base
+file (GLOB SOURCE asio/base.cpp)
+
+init_target (test_transport_asio_base)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+
diff --git a/vendor/websocketpp/test/transport/SConscript b/vendor/websocketpp/test/transport/SConscript
new file mode 100644
index 0000000..71b31b6
--- /dev/null
+++ b/vendor/websocketpp/test/transport/SConscript
@@ -0,0 +1,24 @@
+## transport integration tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random','chrono'],env) + [platform_libs] + [tls_libs]
+
+objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   objs += env_cpp11.Object('stl_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_stl_integration', ["stl_integration.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/transport/asio/SConscript b/vendor/websocketpp/test/transport/asio/SConscript
new file mode 100644
index 0000000..f8185e5
--- /dev/null
+++ b/vendor/websocketpp/test/transport/asio/SConscript
@@ -0,0 +1,32 @@
+## asio transport unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+Import('tls_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','chrono'],env) + [platform_libs] + [tls_libs]
+
+objs = env.Object('base_boost.o', ["base.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('timers_boost.o', ["timers.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('security_boost.o', ["security.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_base_boost', ["base_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_timers_boost', ["timers_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_security_boost', ["security_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework','system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
+   objs += env_cpp11.Object('base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('timers_stl.o', ["timers.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('security_stl.o', ["security.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_base_stl', ["base_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_timers_stl', ["timers_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_security_stl', ["security_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/transport/asio/base.cpp b/vendor/websocketpp/test/transport/asio/base.cpp
new file mode 100644
index 0000000..e9f96ae
--- /dev/null
+++ b/vendor/websocketpp/test/transport/asio/base.cpp
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE transport_asio_base
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+#include <websocketpp/transport/asio/base.hpp>
+
+BOOST_AUTO_TEST_CASE( blank_error ) {
+    websocketpp::lib::error_code ec;
+
+    BOOST_CHECK( !ec );
+}
+
+BOOST_AUTO_TEST_CASE( asio_error ) {
+    using websocketpp::transport::asio::error::make_error_code;
+    using websocketpp::transport::asio::error::general;
+
+    websocketpp::lib::error_code ec = make_error_code(general);
+
+    BOOST_CHECK( ec == general );
+    BOOST_CHECK( ec.value() == 1 );
+}
diff --git a/vendor/websocketpp/test/transport/asio/security.cpp b/vendor/websocketpp/test/transport/asio/security.cpp
new file mode 100644
index 0000000..a75e2a8
--- /dev/null
+++ b/vendor/websocketpp/test/transport/asio/security.cpp
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE transport_asio_base
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+#include <websocketpp/common/type_traits.hpp>
+
+#include <websocketpp/transport/asio/security/none.hpp>
+#include <websocketpp/transport/asio/security/tls.hpp>
+
+template <typename base>
+struct dummy_con : public base {
+	websocketpp::lib::error_code test() {
+		return this->translate_ec(websocketpp::lib::asio::error_code());
+	}
+};
+
+BOOST_AUTO_TEST_CASE( translated_ec_none ) {
+    dummy_con<websocketpp::transport::asio::basic_socket::connection> tscon;
+
+	// If the current configuration settings result in the library error type and the asio
+	// error type being the same, then the code should pass through natively. Otherwise
+	// we should get a generic pass through error.
+	if(websocketpp::lib::is_same<websocketpp::lib::error_code,websocketpp::lib::asio::error_code>::value) {
+    	BOOST_CHECK_EQUAL( tscon.test(), websocketpp::lib::error_code() );
+    } else {
+    	BOOST_CHECK_EQUAL( tscon.test(), websocketpp::transport::error::make_error_code(websocketpp::transport::error::pass_through) );
+    }
+}
+
+BOOST_AUTO_TEST_CASE( translated_ec_tls ) {
+    dummy_con<websocketpp::transport::asio::tls_socket::connection> tscon;
+
+	// If the current configuration settings result in the library error type and the asio
+	// error type being the same, then the code should pass through natively. Otherwise
+	// we should get a generic pass through error.
+	if(websocketpp::lib::is_same<websocketpp::lib::error_code,websocketpp::lib::asio::error_code>::value) {
+    	BOOST_CHECK_EQUAL( tscon.test(), websocketpp::lib::error_code() );
+    } else {
+    	BOOST_CHECK_EQUAL( tscon.test(), websocketpp::transport::error::make_error_code(websocketpp::transport::error::pass_through) );
+    }
+}
diff --git a/vendor/websocketpp/test/transport/asio/timers.cpp b/vendor/websocketpp/test/transport/asio/timers.cpp
new file mode 100644
index 0000000..5498bde
--- /dev/null
+++ b/vendor/websocketpp/test/transport/asio/timers.cpp
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE transport_asio_timers
+#include <boost/test/unit_test.hpp>
+
+#include <exception>
+#include <iostream>
+
+#include <websocketpp/common/thread.hpp>
+
+#include <websocketpp/transport/asio/endpoint.hpp>
+#include <websocketpp/transport/asio/security/tls.hpp>
+
+// Concurrency
+#include <websocketpp/concurrency/none.hpp>
+
+// HTTP
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+
+// Loggers
+#include <websocketpp/logger/stub.hpp>
+//#include <websocketpp/logger/basic.hpp>
+
+#include <boost/asio.hpp>
+
+// Accept a connection, read data, and discard until EOF
+void run_dummy_server(int port) {
+    using boost::asio::ip::tcp;
+
+    try {
+        boost::asio::io_service io_service;
+        tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port));
+        tcp::socket socket(io_service);
+
+        acceptor.accept(socket);
+        for (;;) {
+            char data[512];
+            boost::system::error_code ec;
+            socket.read_some(boost::asio::buffer(data), ec);
+            if (ec == boost::asio::error::eof) {
+                break;
+            } else if (ec) {
+                // other error
+                throw ec;
+            }
+        }
+    } catch (std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (boost::system::error_code & ec) {
+        std::cout << ec.message() << std::endl;
+    }
+}
+
+// Wait for the specified time period then fail the test
+void run_test_timer(long value) {
+    boost::asio::io_service ios;
+    boost::asio::deadline_timer t(ios,boost::posix_time::milliseconds(value));
+    boost::system::error_code ec;
+    t.wait(ec);
+    BOOST_FAIL( "Test timed out" );
+}
+
+struct config {
+    typedef websocketpp::concurrency::none concurrency_type;
+    //typedef websocketpp::log::basic<concurrency_type,websocketpp::log::alevel> alog_type;
+    typedef websocketpp::log::stub alog_type;
+    typedef websocketpp::log::stub elog_type;
+    typedef websocketpp::http::parser::request request_type;
+    typedef websocketpp::http::parser::response response_type;
+    typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+
+    static const bool enable_multithreading = true;
+
+    static const long timeout_socket_pre_init = 1000;
+    static const long timeout_proxy = 1000;
+    static const long timeout_socket_post_init = 1000;
+    static const long timeout_dns_resolve = 1000;
+    static const long timeout_connect = 1000;
+    static const long timeout_socket_shutdown = 1000;
+};
+
+// Mock context that does no validation
+typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
+context_ptr on_tls_init(websocketpp::connection_hdl) {
+    return context_ptr(new boost::asio::ssl::context(boost::asio::ssl::context::sslv23));
+}
+
+// Mock connection
+struct mock_con: public websocketpp::transport::asio::connection<config> {
+    typedef websocketpp::transport::asio::connection<config> base;
+
+    mock_con(bool a, config::alog_type& b, config::elog_type& c) : base(a,b,c) {}
+
+    void start() {
+        base::init(websocketpp::lib::bind(&mock_con::handle_start,this,
+            websocketpp::lib::placeholders::_1));
+    }
+
+    void handle_start(const websocketpp::lib::error_code& ec) {
+        using websocketpp::transport::asio::socket::make_error_code;
+        using websocketpp::transport::asio::socket::error::tls_handshake_timeout;
+
+        BOOST_CHECK_EQUAL( ec, make_error_code(tls_handshake_timeout) );
+
+        base::cancel_socket();
+    }
+};
+
+typedef websocketpp::transport::asio::connection<config> con_type;
+typedef websocketpp::lib::shared_ptr<mock_con> connection_ptr;
+
+struct mock_endpoint : public websocketpp::transport::asio::endpoint<config> {
+    typedef websocketpp::transport::asio::endpoint<config> base;
+
+    mock_endpoint() {
+        alog.set_channels(websocketpp::log::alevel::all);
+        base::init_logging(&alog,&elog);
+        init_asio();
+    }
+
+    void connect(std::string u) {
+        m_con.reset(new mock_con(false,alog,elog));
+        websocketpp::uri_ptr uri(new websocketpp::uri(u));
+
+        BOOST_CHECK( uri->get_valid() );
+        BOOST_CHECK_EQUAL( base::init(m_con), websocketpp::lib::error_code() );
+
+        base::async_connect(
+            m_con,
+            uri,
+            websocketpp::lib::bind(
+                &mock_endpoint::handle_connect,
+                this,
+                m_con,
+                websocketpp::lib::placeholders::_1
+            )
+        );
+    }
+
+    void handle_connect(connection_ptr con, websocketpp::lib::error_code const & ec)
+    {
+        BOOST_CHECK( !ec );
+        con->start();
+    }
+
+    connection_ptr m_con;
+    config::alog_type alog;
+    config::elog_type elog;
+};
+
+BOOST_AUTO_TEST_CASE( tls_handshake_timeout ) {
+    websocketpp::lib::thread dummy_server(websocketpp::lib::bind(&run_dummy_server,9005));
+    websocketpp::lib::thread timer(websocketpp::lib::bind(&run_test_timer,5000));
+    dummy_server.detach();
+    timer.detach();
+
+    mock_endpoint endpoint;
+    endpoint.set_tls_init_handler(&on_tls_init);
+    endpoint.connect("wss://localhost:9005");
+    endpoint.run();
+}
diff --git a/vendor/websocketpp/test/transport/hybi_util.cpp b/vendor/websocketpp/test/transport/hybi_util.cpp
new file mode 100644
index 0000000..309bf37
--- /dev/null
+++ b/vendor/websocketpp/test/transport/hybi_util.cpp
@@ -0,0 +1,98 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE hybi_util
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+#include "../../src/processors/hybi_util.hpp"
+#include "../../src/network_utilities.hpp"
+
+BOOST_AUTO_TEST_CASE( circshift_0 ) {
+    if (sizeof(size_t) == 8) {
+        size_t test = 0x0123456789abcdef;
+
+        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,0);
+
+        BOOST_CHECK( test == 0x0123456789abcdef);
+    } else {
+        size_t test = 0x01234567;
+
+        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,0);
+
+        BOOST_CHECK( test == 0x01234567);
+    }
+}
+
+BOOST_AUTO_TEST_CASE( circshift_1 ) {
+    if (sizeof(size_t) == 8) {
+        size_t test = 0x0123456789abcdef;
+
+        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,1);
+
+        BOOST_CHECK( test == 0xef0123456789abcd);
+    } else {
+        size_t test = 0x01234567;
+
+        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,1);
+
+        BOOST_CHECK( test == 0x67012345);
+    }
+}
+
+BOOST_AUTO_TEST_CASE( circshift_2 ) {
+    if (sizeof(size_t) == 8) {
+        size_t test = 0x0123456789abcdef;
+
+        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,2);
+
+        BOOST_CHECK( test == 0xcdef0123456789ab);
+    } else {
+        size_t test = 0x01234567;
+
+        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,2);
+
+        BOOST_CHECK( test == 0x45670123);
+    }
+}
+
+BOOST_AUTO_TEST_CASE( circshift_3 ) {
+    if (sizeof(size_t) == 8) {
+        size_t test = 0x0123456789abcdef;
+
+        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,3);
+
+        BOOST_CHECK( test == 0xabcdef0123456789);
+    } else {
+        size_t test = 0x01234567;
+
+        test = websocketpp::processor::hybi_util::circshift_prepared_key(test,3);
+
+        BOOST_CHECK( test == 0x23456701);
+    }
+}
diff --git a/vendor/websocketpp/test/transport/integration.cpp b/vendor/websocketpp/test/transport/integration.cpp
new file mode 100644
index 0000000..f886fbf
--- /dev/null
+++ b/vendor/websocketpp/test/transport/integration.cpp
@@ -0,0 +1,617 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE transport_integration
+#include <boost/test/unit_test.hpp>
+
+#include <websocketpp/common/thread.hpp>
+
+#include <websocketpp/config/core.hpp>
+#include <websocketpp/config/core_client.hpp>
+#include <websocketpp/config/asio.hpp>
+#include <websocketpp/config/asio_client.hpp>
+#include <websocketpp/config/debug_asio.hpp>
+#include <websocketpp/server.hpp>
+#include <websocketpp/client.hpp>
+
+struct config : public websocketpp::config::asio_client {
+    typedef config type;
+    typedef websocketpp::config::asio base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+
+    //static const websocketpp::log::level elog_level = websocketpp::log::elevel::all;
+    //static const websocketpp::log::level alog_level = websocketpp::log::alevel::all;
+
+    /// Length of time before an opening handshake is aborted
+    static const long timeout_open_handshake = 500;
+    /// Length of time before a closing handshake is aborted
+    static const long timeout_close_handshake = 500;
+    /// Length of time to wait for a pong after a ping
+    static const long timeout_pong = 500;
+};
+
+struct config_tls : public websocketpp::config::asio_tls_client {
+    typedef config type;
+    typedef websocketpp::config::asio base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+
+    //static const websocketpp::log::level elog_level = websocketpp::log::elevel::all;
+    //static const websocketpp::log::level alog_level = websocketpp::log::alevel::all;
+
+    /// Length of time before an opening handshake is aborted
+    static const long timeout_open_handshake = 500;
+    /// Length of time before a closing handshake is aborted
+    static const long timeout_close_handshake = 500;
+    /// Length of time to wait for a pong after a ping
+    static const long timeout_pong = 500;
+};
+
+typedef websocketpp::server<config> server;
+typedef websocketpp::client<config> client;
+
+typedef websocketpp::server<config_tls> server_tls;
+typedef websocketpp::client<config_tls> client_tls;
+
+typedef websocketpp::server<websocketpp::config::core> iostream_server;
+typedef websocketpp::client<websocketpp::config::core_client> iostream_client;
+
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+template <typename T>
+void close_after_timeout(T & e, websocketpp::connection_hdl hdl, long timeout) {
+    sleep(timeout);
+
+    websocketpp::lib::error_code ec;
+    e.close(hdl,websocketpp::close::status::normal,"",ec);
+    BOOST_CHECK(!ec);
+}
+
+void run_server(server * s, int port, bool log = false) {
+    if (log) {
+        s->set_access_channels(websocketpp::log::alevel::all);
+        s->set_error_channels(websocketpp::log::elevel::all);
+    } else {
+        s->clear_access_channels(websocketpp::log::alevel::all);
+        s->clear_error_channels(websocketpp::log::elevel::all);
+    }
+
+    s->init_asio();
+    s->set_reuse_addr(true);
+
+    s->listen(port);
+    s->start_accept();
+    s->run();
+}
+
+void run_client(client & c, std::string uri, bool log = false) {
+    if (log) {
+        c.set_access_channels(websocketpp::log::alevel::all);
+        c.set_error_channels(websocketpp::log::elevel::all);
+    } else {
+        c.clear_access_channels(websocketpp::log::alevel::all);
+        c.clear_error_channels(websocketpp::log::elevel::all);
+    }
+    websocketpp::lib::error_code ec;
+    c.init_asio(ec);
+    c.set_reuse_addr(true);
+    BOOST_CHECK(!ec);
+
+    client::connection_ptr con = c.get_connection(uri,ec);
+    BOOST_CHECK( !ec );
+    c.connect(con);
+
+    c.run();
+}
+
+void run_client_and_mark(client * c, bool * flag, websocketpp::lib::mutex * mutex) {
+    c->run();
+    BOOST_CHECK( true );
+    websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(*mutex);
+    *flag = true;
+    BOOST_CHECK( true );
+}
+
+void run_time_limited_client(client & c, std::string uri, long timeout,
+    bool log)
+{
+    if (log) {
+        c.set_access_channels(websocketpp::log::alevel::all);
+        c.set_error_channels(websocketpp::log::elevel::all);
+    } else {
+        c.clear_access_channels(websocketpp::log::alevel::all);
+        c.clear_error_channels(websocketpp::log::elevel::all);
+    }
+    c.init_asio();
+
+    websocketpp::lib::error_code ec;
+    client::connection_ptr con = c.get_connection(uri,ec);
+    BOOST_CHECK( !ec );
+    c.connect(con);
+
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(
+        &close_after_timeout<client>,
+        websocketpp::lib::ref(c),
+        con->get_handle(),
+        timeout
+    ));
+    tthread.detach();
+
+    c.run();
+}
+
+void run_dummy_server(int port) {
+    using boost::asio::ip::tcp;
+
+    try {
+        boost::asio::io_service io_service;
+        tcp::acceptor acceptor(io_service, tcp::endpoint(tcp::v6(), port));
+        tcp::socket socket(io_service);
+
+        acceptor.accept(socket);
+        for (;;) {
+            char data[512];
+            boost::system::error_code ec;
+            socket.read_some(boost::asio::buffer(data), ec);
+            if (ec == boost::asio::error::eof) {
+                break;
+            } else if (ec) {
+                // other error
+                throw ec;
+            }
+        }
+    } catch (std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (boost::system::error_code & ec) {
+        std::cout << ec.message() << std::endl;
+    }
+}
+
+void run_dummy_client(std::string port) {
+    using boost::asio::ip::tcp;
+
+    try {
+        boost::asio::io_service io_service;
+        tcp::resolver resolver(io_service);
+        tcp::resolver::query query("localhost", port);
+        tcp::resolver::iterator iterator = resolver.resolve(query);
+        tcp::socket socket(io_service);
+
+        boost::asio::connect(socket, iterator);
+        for (;;) {
+            char data[512];
+            boost::system::error_code ec;
+            socket.read_some(boost::asio::buffer(data), ec);
+            if (ec == boost::asio::error::eof) {
+                break;
+            } else if (ec) {
+                // other error
+                throw ec;
+            }
+        }
+    } catch (std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (boost::system::error_code & ec) {
+        std::cout << ec.message() << std::endl;
+    }
+}
+
+bool on_ping(server * s, websocketpp::connection_hdl, std::string) {
+    s->get_alog().write(websocketpp::log::alevel::app,"got ping");
+    return false;
+}
+
+void cancel_on_open(server * s, websocketpp::connection_hdl) {
+    s->stop_listening();
+}
+
+void stop_on_close(server * s, websocketpp::connection_hdl hdl) {
+    server::connection_ptr con = s->get_con_from_hdl(hdl);
+    //BOOST_CHECK_EQUAL( con->get_local_close_code(), websocketpp::close::status::normal );
+    //BOOST_CHECK_EQUAL( con->get_remote_close_code(), websocketpp::close::status::normal );
+    s->stop();
+}
+
+template <typename T>
+void ping_on_open(T * c, std::string payload, websocketpp::connection_hdl hdl) {
+    typename T::connection_ptr con = c->get_con_from_hdl(hdl);
+    websocketpp::lib::error_code ec;
+    con->ping(payload,ec);
+    BOOST_CHECK_EQUAL(ec, websocketpp::lib::error_code());
+}
+
+void fail_on_pong(websocketpp::connection_hdl, std::string) {
+    BOOST_FAIL( "expected no pong handler" );
+}
+
+void fail_on_pong_timeout(websocketpp::connection_hdl, std::string) {
+    BOOST_FAIL( "expected no pong timeout" );
+}
+
+void req_pong(std::string expected_payload, websocketpp::connection_hdl,
+    std::string payload)
+{
+    BOOST_CHECK_EQUAL( expected_payload, payload );
+}
+
+void fail_on_open(websocketpp::connection_hdl) {
+    BOOST_FAIL( "expected no open handler" );
+}
+
+void delay(websocketpp::connection_hdl, long duration) {
+    sleep(duration);
+}
+
+template <typename T>
+void check_ec(T * c, websocketpp::lib::error_code ec,
+    websocketpp::connection_hdl hdl)
+{
+    typename T::connection_ptr con = c->get_con_from_hdl(hdl);
+    BOOST_CHECK_EQUAL( con->get_ec(), ec );
+    //BOOST_CHECK_EQUAL( con->get_local_close_code(), websocketpp::close::status::normal );
+    //BOOST_CHECK_EQUAL( con->get_remote_close_code(), websocketpp::close::status::normal );
+}
+
+template <typename T>
+void check_ec_and_stop(T * e, websocketpp::lib::error_code ec,
+    websocketpp::connection_hdl hdl)
+{
+    typename T::connection_ptr con = e->get_con_from_hdl(hdl);
+    BOOST_CHECK_EQUAL( con->get_ec(), ec );
+    //BOOST_CHECK_EQUAL( con->get_local_close_code(), websocketpp::close::status::normal );
+    //BOOST_CHECK_EQUAL( con->get_remote_close_code(), websocketpp::close::status::normal );
+    e->stop();
+}
+
+template <typename T>
+void req_pong_timeout(T * c, std::string expected_payload,
+    websocketpp::connection_hdl hdl, std::string payload)
+{
+    typename T::connection_ptr con = c->get_con_from_hdl(hdl);
+    BOOST_CHECK_EQUAL( payload, expected_payload );
+    con->close(websocketpp::close::status::normal,"");
+}
+
+template <typename T>
+void close(T * e, websocketpp::connection_hdl hdl) {
+    e->get_con_from_hdl(hdl)->close(websocketpp::close::status::normal,"");
+}
+
+// Wait for the specified time period then fail the test
+void run_test_timer(long value) {
+    sleep(value);
+    BOOST_FAIL( "Test timed out" );
+}
+
+BOOST_AUTO_TEST_CASE( pong_no_timeout ) {
+    server s;
+    client c;
+
+    s.set_close_handler(bind(&stop_on_close,&s,::_1));
+
+    // send a ping when the connection is open
+    c.set_open_handler(bind(&ping_on_open<client>,&c,"foo",::_1));
+    // require that a pong with matching payload is received
+    c.set_pong_handler(bind(&req_pong,"foo",::_1,::_2));
+    // require that a pong timeout is NOT received
+    c.set_pong_timeout_handler(bind(&fail_on_pong_timeout,::_1,::_2));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
+
+    // Run a client that closes the connection after 1 seconds
+    run_time_limited_client(c, "http://localhost:9005", 1, false);
+
+    sthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( pong_timeout ) {
+    server s;
+    client c;
+
+    s.set_ping_handler(bind(&on_ping, &s,::_1,::_2));
+    s.set_close_handler(bind(&stop_on_close,&s,::_1));
+
+    c.set_fail_handler(bind(&check_ec<client>,&c,
+        websocketpp::lib::error_code(),::_1));
+
+    c.set_pong_handler(bind(&fail_on_pong,::_1,::_2));
+    c.set_open_handler(bind(&ping_on_open<client>,&c,"foo",::_1));
+    c.set_pong_timeout_handler(bind(&req_pong_timeout<client>,&c,"foo",::_1,::_2));
+    c.set_close_handler(bind(&check_ec<client>,&c,
+        websocketpp::lib::error_code(),::_1));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,10));
+    tthread.detach();
+
+    run_client(c, "http://localhost:9005",false);
+
+    sthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( client_open_handshake_timeout ) {
+    client c;
+
+    // set open handler to fail test
+    c.set_open_handler(bind(&fail_on_open,::_1));
+    // set fail hander to test for the right fail error code
+    c.set_fail_handler(bind(&check_ec<client>,&c,
+        websocketpp::error::open_handshake_timeout,::_1));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_dummy_server,9005));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,10));
+    sthread.detach();
+    tthread.detach();
+
+    run_client(c, "http://localhost:9005");
+}
+
+BOOST_AUTO_TEST_CASE( server_open_handshake_timeout ) {
+    server s;
+
+    // set open handler to fail test
+    s.set_open_handler(bind(&fail_on_open,::_1));
+    // set fail hander to test for the right fail error code
+    s.set_fail_handler(bind(&check_ec_and_stop<server>,&s,
+        websocketpp::error::open_handshake_timeout,::_1));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,10));
+    tthread.detach();
+
+    run_dummy_client("9005");
+
+    sthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( client_self_initiated_close_handshake_timeout ) {
+    server s;
+    client c;
+
+    // on open server sleeps for longer than the timeout
+    // on open client sends close handshake
+    // client handshake timer should be triggered
+    s.set_open_handler(bind(&delay,::_1,1));
+    s.set_close_handler(bind(&stop_on_close,&s,::_1));
+
+    c.set_open_handler(bind(&close<client>,&c,::_1));
+    c.set_close_handler(bind(&check_ec<client>,&c,
+        websocketpp::error::close_handshake_timeout,::_1));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,10));
+    tthread.detach();
+
+    run_client(c, "http://localhost:9005", false);
+
+    sthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( client_peer_initiated_close_handshake_timeout ) {
+    // on open server sends close
+    // client should ack normally and then wait
+    // server leaves TCP connection open
+    // client handshake timer should be triggered
+
+    // TODO: how to make a mock server that leaves the TCP connection open?
+}
+
+BOOST_AUTO_TEST_CASE( server_self_initiated_close_handshake_timeout ) {
+    server s;
+    client c;
+
+    // on open server sends close
+    // on open client sleeps for longer than the timeout
+    // server handshake timer should be triggered
+
+    s.set_open_handler(bind(&close<server>,&s,::_1));
+    s.set_close_handler(bind(&check_ec_and_stop<server>,&s,
+        websocketpp::error::close_handshake_timeout,::_1));
+
+    c.set_open_handler(bind(&delay,::_1,1));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,10));
+    tthread.detach();
+
+    run_client(c, "http://localhost:9005",false);
+
+    sthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( client_runs_out_of_work ) {
+    client c;
+
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,3));
+    tthread.detach();
+
+    websocketpp::lib::error_code ec;
+    c.init_asio(ec);
+    BOOST_CHECK(!ec);
+
+    c.run();
+
+    // This test checks that an io_service with no work ends immediately.
+    BOOST_CHECK(true);
+}
+
+
+
+
+BOOST_AUTO_TEST_CASE( client_is_perpetual ) {
+    client c;
+    bool flag = false;
+    websocketpp::lib::mutex mutex;
+
+    websocketpp::lib::error_code ec;
+    c.init_asio(ec);
+    BOOST_CHECK(!ec);
+
+    c.start_perpetual();
+
+    websocketpp::lib::thread cthread(websocketpp::lib::bind(&run_client_and_mark,&c,&flag,&mutex));
+
+    sleep(1);
+
+    {
+        // Checks that the thread hasn't exited yet
+        websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(mutex);
+        BOOST_CHECK( !flag );
+    }
+
+    c.stop_perpetual();
+
+    sleep(1);
+
+    {
+        // Checks that the thread has exited
+        websocketpp::lib::lock_guard<websocketpp::lib::mutex> lock(mutex);
+        BOOST_CHECK( flag );
+    }
+
+    cthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( client_failed_connection ) {
+    client c;
+
+    run_time_limited_client(c,"http://localhost:9005", 5, false);
+}
+
+BOOST_AUTO_TEST_CASE( stop_listening ) {
+    server s;
+    client c;
+
+    // the first connection stops the server from listening
+    s.set_open_handler(bind(&cancel_on_open,&s,::_1));
+
+    // client immediately closes after opening a connection
+    c.set_open_handler(bind(&close<client>,&c,::_1));
+
+    websocketpp::lib::thread sthread(websocketpp::lib::bind(&run_server,&s,9005,false));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,5));
+    tthread.detach();
+
+    run_client(c, "http://localhost:9005",false);
+
+    sthread.join();
+}
+
+BOOST_AUTO_TEST_CASE( pause_reading ) {
+    iostream_server s;
+    std::string handshake = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
+    char buffer[2] = { char(0x81), char(0x80) };
+
+    // suppress output (it needs a place to go to avoid error but we don't care what it is)
+    std::stringstream null_output;
+    s.register_ostream(&null_output);
+
+    iostream_server::connection_ptr con = s.get_connection();
+    con->start();
+
+    // read handshake, should work
+    BOOST_CHECK_EQUAL( con->read_some(handshake.data(), handshake.length()), handshake.length());
+
+    // pause reading and try again. The first read should work, the second should return 0
+    // the first read was queued already after the handshake so it will go through because
+    // reading wasn't paused when it was queued. The byte it reads wont be enough to
+    // complete the frame so another read will be requested. This one wont actually happen
+    // because the connection is paused now.
+    con->pause_reading();
+    BOOST_CHECK_EQUAL( con->read_some(buffer, 1), 1);
+    BOOST_CHECK_EQUAL( con->read_some(buffer+1, 1), 0);
+    // resume reading and try again. Should work this time because the resume should have
+    // re-queued a read.
+    con->resume_reading();
+    BOOST_CHECK_EQUAL( con->read_some(buffer+1, 1), 1);
+}
+
+
+BOOST_AUTO_TEST_CASE( server_connection_cleanup ) {
+    server_tls s;
+}
+
+#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+BOOST_AUTO_TEST_CASE( move_construct_transport ) {
+    server s1;
+    
+    server s2(std::move(s1));
+}
+#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
diff --git a/vendor/websocketpp/test/transport/iostream/SConscript b/vendor/websocketpp/test/transport/iostream/SConscript
new file mode 100644
index 0000000..9e74c2f
--- /dev/null
+++ b/vendor/websocketpp/test/transport/iostream/SConscript
@@ -0,0 +1,31 @@
+## iostream transport unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
+
+objs = env.Object('iostream_base_boost.o', ["base.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('iostream_connection_boost.o', ["connection.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('iostream_endpoint_boost.o', ["endpoint.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_iostream_base_boost', ["iostream_base_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_iostream_connection_boost', ["iostream_connection_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_iostream_endpoint_boost', ["iostream_endpoint_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   objs += env_cpp11.Object('iostream_base_stl.o', ["base.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('iostream_connection_stl.o', ["connection.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('iostream_endpoint_stl.o', ["endpoint.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_iostream_base_stl', ["iostream_base_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_iostream_connection_stl', ["iostream_connection_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_iostream_endpoint_stl', ["iostream_endpoint_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/transport/iostream/base.cpp b/vendor/websocketpp/test/transport/iostream/base.cpp
new file mode 100644
index 0000000..a7eefc2
--- /dev/null
+++ b/vendor/websocketpp/test/transport/iostream/base.cpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE transport_iostream_base
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+BOOST_AUTO_TEST_CASE( placeholder ) {}
diff --git a/vendor/websocketpp/test/transport/iostream/connection.cpp b/vendor/websocketpp/test/transport/iostream/connection.cpp
new file mode 100644
index 0000000..2a45013
--- /dev/null
+++ b/vendor/websocketpp/test/transport/iostream/connection.cpp
@@ -0,0 +1,609 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE transport_iostream_connection
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <cstring>
+#include <string>
+
+#include <websocketpp/common/memory.hpp>
+
+#include <websocketpp/error.hpp>
+#include <websocketpp/transport/iostream/connection.hpp>
+
+// Policies
+#include <websocketpp/concurrency/basic.hpp>
+#include <websocketpp/logger/basic.hpp>
+
+struct config {
+    typedef websocketpp::concurrency::basic concurrency_type;
+    typedef websocketpp::log::basic<concurrency_type,
+        websocketpp::log::elevel> elog_type;
+    typedef websocketpp::log::basic<concurrency_type,
+        websocketpp::log::alevel> alog_type;
+};
+
+typedef websocketpp::transport::iostream::connection<config> iostream_con;
+
+using websocketpp::transport::iostream::error::make_error_code;
+
+struct stub_con : public iostream_con {
+    typedef stub_con type;
+    typedef websocketpp::lib::shared_ptr<type> ptr;
+    typedef iostream_con::timer_ptr timer_ptr;
+
+    stub_con(bool is_server, config::alog_type & a, config::elog_type & e)
+        : iostream_con(is_server,a,e)
+        // Set the error to a known code that is unused by the library
+        // This way we can easily confirm that the handler was run at all.
+        , ec(websocketpp::error::make_error_code(websocketpp::error::test))
+        , indef_read_total(0)
+    {}
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return websocketpp::lib::static_pointer_cast<type>(iostream_con::get_shared());
+    }
+
+    void write(std::string msg) {
+        iostream_con::async_write(
+            msg.data(),
+            msg.size(),
+            websocketpp::lib::bind(
+                &stub_con::handle_op,
+                type::get_shared(),
+                websocketpp::lib::placeholders::_1
+            )
+        );
+    }
+
+    void write(std::vector<websocketpp::transport::buffer> & bufs) {
+        iostream_con::async_write(
+            bufs,
+            websocketpp::lib::bind(
+                &stub_con::handle_op,
+                type::get_shared(),
+                websocketpp::lib::placeholders::_1
+            )
+        );
+    }
+
+    void async_read_at_least(size_t num_bytes, char *buf, size_t len)
+    {
+        iostream_con::async_read_at_least(
+            num_bytes,
+            buf,
+            len,
+            websocketpp::lib::bind(
+                &stub_con::handle_op,
+                type::get_shared(),
+                websocketpp::lib::placeholders::_1
+            )
+        );
+    }
+
+    void handle_op(websocketpp::lib::error_code const & e) {
+        ec = e;
+    }
+
+    void async_read_indef(size_t num_bytes, char *buf, size_t len)
+    {
+        indef_read_size = num_bytes;
+        indef_read_buf = buf;
+        indef_read_len = len;
+
+        indef_read();
+    }
+
+    void indef_read() {
+        iostream_con::async_read_at_least(
+            indef_read_size,
+            indef_read_buf,
+            indef_read_len,
+            websocketpp::lib::bind(
+                &stub_con::handle_indef,
+                type::get_shared(),
+                websocketpp::lib::placeholders::_1,
+                websocketpp::lib::placeholders::_2
+            )
+        );
+    }
+
+    void handle_indef(websocketpp::lib::error_code const & e, size_t amt_read) {
+        ec = e;
+        indef_read_total += amt_read;
+
+        indef_read();
+    }
+
+    void shutdown() {
+        iostream_con::async_shutdown(
+            websocketpp::lib::bind(
+                &stub_con::handle_async_shutdown,
+                type::get_shared(),
+                websocketpp::lib::placeholders::_1
+            )
+        );
+    }
+
+    void handle_async_shutdown(websocketpp::lib::error_code const & e) {
+        ec = e;
+    }
+
+    websocketpp::lib::error_code ec;
+    size_t indef_read_size;
+    char * indef_read_buf;
+    size_t indef_read_len;
+    size_t indef_read_total;
+};
+
+// Stubs
+config::alog_type alogger;
+config::elog_type elogger;
+
+BOOST_AUTO_TEST_CASE( const_methods ) {
+    iostream_con::ptr con(new iostream_con(true,alogger,elogger));
+
+    BOOST_CHECK( !con->is_secure() );
+    BOOST_CHECK_EQUAL( con->get_remote_endpoint(), "iostream transport" );
+}
+
+BOOST_AUTO_TEST_CASE( write_before_output_method_set ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    con->write("foo");
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
+
+    std::vector<websocketpp::transport::buffer> bufs;
+    con->write(bufs);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
+}
+
+BOOST_AUTO_TEST_CASE( async_write_ostream ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    std::stringstream output;
+
+    con->register_ostream(&output);
+
+    con->write("foo");
+
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( output.str(), "foo" );
+}
+
+websocketpp::lib::error_code write_handler(std::string & o, websocketpp::connection_hdl, char const * buf, size_t len) {
+    o += std::string(buf,len);
+    return websocketpp::lib::error_code();
+}
+
+websocketpp::lib::error_code vector_write_handler(std::string & o, websocketpp::connection_hdl, std::vector<websocketpp::transport::buffer> const & bufs) {
+    std::vector<websocketpp::transport::buffer>::const_iterator it;
+    for (it = bufs.begin(); it != bufs.end(); it++) {
+        o += std::string((*it).buf, (*it).len);
+    }
+
+    return websocketpp::lib::error_code();
+}
+
+websocketpp::lib::error_code write_handler_error(websocketpp::connection_hdl, char const *, size_t) {
+    return make_error_code(websocketpp::transport::error::general);
+}
+
+BOOST_AUTO_TEST_CASE( async_write_handler ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    std::string output;
+
+    con->set_write_handler(websocketpp::lib::bind(
+        &write_handler,
+        websocketpp::lib::ref(output),
+        websocketpp::lib::placeholders::_1,
+        websocketpp::lib::placeholders::_2,
+        websocketpp::lib::placeholders::_3
+    ));
+    con->write("foo");
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL(output, "foo");
+}
+
+BOOST_AUTO_TEST_CASE( async_write_handler_error ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    con->set_write_handler(&write_handler_error);
+    con->write("foo");
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::general) );
+}
+
+BOOST_AUTO_TEST_CASE( async_write_vector_0_ostream ) {
+    std::stringstream output;
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->register_ostream(&output);
+
+    std::vector<websocketpp::transport::buffer> bufs;
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( output.str(), "" );
+}
+
+BOOST_AUTO_TEST_CASE( async_write_vector_0_write_handler ) {
+    std::string output;
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    con->set_write_handler(websocketpp::lib::bind(
+        &write_handler,
+        websocketpp::lib::ref(output),
+        websocketpp::lib::placeholders::_1,
+        websocketpp::lib::placeholders::_2,
+        websocketpp::lib::placeholders::_3
+    ));
+
+    std::vector<websocketpp::transport::buffer> bufs;
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( output, "" );
+}
+
+BOOST_AUTO_TEST_CASE( async_write_vector_1_ostream ) {
+    std::stringstream output;
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->register_ostream(&output);
+
+    std::vector<websocketpp::transport::buffer> bufs;
+
+    std::string foo = "foo";
+
+    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( output.str(), "foo" );
+}
+
+BOOST_AUTO_TEST_CASE( async_write_vector_1_write_handler ) {
+    std::string output;
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->set_write_handler(websocketpp::lib::bind(
+        &write_handler,
+        websocketpp::lib::ref(output),
+        websocketpp::lib::placeholders::_1,
+        websocketpp::lib::placeholders::_2,
+        websocketpp::lib::placeholders::_3
+    ));
+
+    std::vector<websocketpp::transport::buffer> bufs;
+
+    std::string foo = "foo";
+
+    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( output, "foo" );
+}
+
+BOOST_AUTO_TEST_CASE( async_write_vector_2_ostream ) {
+    std::stringstream output;
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->register_ostream(&output);
+
+    std::vector<websocketpp::transport::buffer> bufs;
+
+    std::string foo = "foo";
+    std::string bar = "bar";
+
+    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
+    bufs.push_back(websocketpp::transport::buffer(bar.data(),bar.size()));
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( output.str(), "foobar" );
+}
+
+BOOST_AUTO_TEST_CASE( async_write_vector_2_write_handler ) {
+    std::string output;
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->set_write_handler(websocketpp::lib::bind(
+        &write_handler,
+        websocketpp::lib::ref(output),
+        websocketpp::lib::placeholders::_1,
+        websocketpp::lib::placeholders::_2,
+        websocketpp::lib::placeholders::_3
+    ));
+
+    std::vector<websocketpp::transport::buffer> bufs;
+
+    std::string foo = "foo";
+    std::string bar = "bar";
+
+    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
+    bufs.push_back(websocketpp::transport::buffer(bar.data(),bar.size()));
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( output, "foobar" );
+}
+
+BOOST_AUTO_TEST_CASE( async_write_vector_2_vector_write_handler ) {
+    std::string output;
+
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    con->set_vector_write_handler(websocketpp::lib::bind(
+        &vector_write_handler,
+        websocketpp::lib::ref(output),
+        websocketpp::lib::placeholders::_1,
+        websocketpp::lib::placeholders::_2
+    ));
+
+    std::vector<websocketpp::transport::buffer> bufs;
+
+    std::string foo = "foo";
+    std::string bar = "bar";
+
+    bufs.push_back(websocketpp::transport::buffer(foo.data(),foo.size()));
+    bufs.push_back(websocketpp::transport::buffer(bar.data(),bar.size()));
+
+    con->write(bufs);
+
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( output, "foobar" );
+}
+
+BOOST_AUTO_TEST_CASE( async_read_at_least_too_much ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    char buf[10];
+
+    con->async_read_at_least(11,buf,10);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::iostream::error::invalid_num_bytes) );
+}
+
+BOOST_AUTO_TEST_CASE( async_read_at_least_double_read ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    char buf[10];
+
+    con->async_read_at_least(5,buf,10);
+    con->async_read_at_least(5,buf,10);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::iostream::error::double_read) );
+}
+
+BOOST_AUTO_TEST_CASE( async_read_at_least ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    char buf[10];
+
+    memset(buf,'x',10);
+
+    con->async_read_at_least(5,buf,10);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+
+    std::stringstream channel;
+    channel << "abcd";
+    channel >> *con;
+    BOOST_CHECK_EQUAL( channel.tellg(), -1 );
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+
+    std::stringstream channel2;
+    channel2 << "e";
+    channel2 >> *con;
+    BOOST_CHECK_EQUAL( channel2.tellg(), -1 );
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+
+    std::stringstream channel3;
+    channel3 << "f";
+    channel3 >> *con;
+    BOOST_CHECK_EQUAL( channel3.tellg(), 0 );
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+    con->async_read_at_least(1,buf+5,5);
+    channel3 >> *con;
+    BOOST_CHECK_EQUAL( channel3.tellg(), -1 );
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefxxxx" );
+}
+
+BOOST_AUTO_TEST_CASE( async_read_at_least2 ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    char buf[10];
+
+    memset(buf,'x',10);
+
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+
+    std::stringstream channel;
+    channel << "abcdefg";
+    channel >> *con;
+    BOOST_CHECK_EQUAL( channel.tellg(), 5 );
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+
+    con->async_read_at_least(1,buf+5,5);
+    channel >> *con;
+    BOOST_CHECK_EQUAL( channel.tellg(), -1 );
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefgxxx" );
+}
+
+void timer_callback_stub(websocketpp::lib::error_code const &) {}
+
+BOOST_AUTO_TEST_CASE( set_timer ) {
+   stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    stub_con::timer_ptr tp = con->set_timer(1000,timer_callback_stub);
+
+    BOOST_CHECK( !tp );
+}
+
+BOOST_AUTO_TEST_CASE( async_read_at_least_read_some ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    char buf[10];
+    memset(buf,'x',10);
+
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+
+    char input[10] = "abcdefg";
+    BOOST_CHECK_EQUAL(con->read_some(input,5), 5);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+
+    BOOST_CHECK_EQUAL(con->read_some(input+5,2), 0);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+
+    con->async_read_at_least(1,buf+5,5);
+    BOOST_CHECK_EQUAL(con->read_some(input+5,2), 2);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefgxxx" );
+}
+
+BOOST_AUTO_TEST_CASE( async_read_at_least_read_some_indef ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    char buf[20];
+    memset(buf,'x',20);
+
+    con->async_read_indef(5,buf,5);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+
+    // here we expect to return early from read some because the outstanding
+    // read was for 5 bytes and we were called with 10.
+    char input[11] = "aaaaabbbbb";
+    BOOST_CHECK_EQUAL(con->read_some(input,10), 5);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "aaaaaxxxxx" );
+    BOOST_CHECK_EQUAL( con->indef_read_total, 5 );
+
+    // A subsequent read should read 5 more because the indef read refreshes
+    // itself. The new read will start again at the beginning of the buffer.
+    BOOST_CHECK_EQUAL(con->read_some(input+5,5), 5);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "bbbbbxxxxx" );
+    BOOST_CHECK_EQUAL( con->indef_read_total, 10 );
+}
+
+BOOST_AUTO_TEST_CASE( async_read_at_least_read_all ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    char buf[20];
+    memset(buf,'x',20);
+
+    con->async_read_indef(5,buf,5);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+
+    char input[11] = "aaaaabbbbb";
+    BOOST_CHECK_EQUAL(con->read_all(input,10), 10);
+    BOOST_CHECK( !con->ec );
+    BOOST_CHECK_EQUAL( std::string(buf,10), "bbbbbxxxxx" );
+    BOOST_CHECK_EQUAL( con->indef_read_total, 10 );
+}
+
+BOOST_AUTO_TEST_CASE( eof_flag ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    char buf[10];
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+    con->eof();
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::eof) );
+}
+
+BOOST_AUTO_TEST_CASE( fatal_error_flag ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    char buf[10];
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+    con->fatal_error();
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::pass_through) );
+}
+
+BOOST_AUTO_TEST_CASE( shutdown ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+    con->shutdown();
+    BOOST_CHECK_EQUAL( con->ec, websocketpp::lib::error_code() );
+}
+
+websocketpp::lib::error_code sd_handler(websocketpp::connection_hdl) {
+    return make_error_code(websocketpp::transport::error::general);
+}
+
+BOOST_AUTO_TEST_CASE( shutdown_handler ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    con->set_shutdown_handler(&sd_handler);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+    con->shutdown();
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::general) );
+}
+
+BOOST_AUTO_TEST_CASE( shared_pointer_memory_cleanup ) {
+    stub_con::ptr con(new stub_con(true,alogger,elogger));
+
+    BOOST_CHECK_EQUAL(con.use_count(), 1);
+
+    char buf[10];
+    memset(buf,'x',10);
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+    BOOST_CHECK_EQUAL(con.use_count(), 2);
+
+    char input[10] = "foo";
+    con->read_some(input,3);
+    BOOST_CHECK_EQUAL(con.use_count(), 2);
+
+    con->read_some(input,2);
+    BOOST_CHECK_EQUAL( std::string(buf,10), "foofoxxxxx" );
+    BOOST_CHECK_EQUAL(con.use_count(), 1);
+
+    con->async_read_at_least(5,buf,5);
+    BOOST_CHECK_EQUAL(con.use_count(), 2);
+
+    con->eof();
+    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::eof) );
+    BOOST_CHECK_EQUAL(con.use_count(), 1);
+}
+
diff --git a/vendor/websocketpp/test/transport/iostream/endpoint.cpp b/vendor/websocketpp/test/transport/iostream/endpoint.cpp
new file mode 100644
index 0000000..ded9967
--- /dev/null
+++ b/vendor/websocketpp/test/transport/iostream/endpoint.cpp
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE transport_iostream_endpoint
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+
+#include <websocketpp/transport/iostream/endpoint.hpp>
+
+BOOST_AUTO_TEST_CASE( placeholder ) {}
+
+/*BOOST_AUTO_TEST_CASE( blank_error ) {
+    websocketpp::lib::error_code ec;
+
+    BOOST_CHECK( !ec );
+}*/
diff --git a/vendor/websocketpp/test/utility/CMakeLists.txt b/vendor/websocketpp/test/utility/CMakeLists.txt
new file mode 100644
index 0000000..3903f13
--- /dev/null
+++ b/vendor/websocketpp/test/utility/CMakeLists.txt
@@ -0,0 +1,53 @@
+# Test close utilities
+file (GLOB SOURCE close.cpp)
+
+init_target (test_close)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test error utilities
+file (GLOB SOURCE error.cpp)
+
+init_target (test_error)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test frame utilities
+file (GLOB SOURCE frame.cpp)
+
+init_target (test_frame)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test sha1 utilities
+file (GLOB SOURCE sha1.cpp)
+
+init_target (test_sha1)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test uri utilities
+file (GLOB SOURCE uri.cpp)
+
+init_target (test_uri)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
+
+# Test misc utilities
+file (GLOB SOURCE utilities.cpp)
+
+init_target (test_utilities)
+build_test (${TARGET_NAME} ${SOURCE})
+link_boost ()
+final_target ()
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
diff --git a/vendor/websocketpp/test/utility/SConscript b/vendor/websocketpp/test/utility/SConscript
new file mode 100644
index 0000000..80e9ef6
--- /dev/null
+++ b/vendor/websocketpp/test/utility/SConscript
@@ -0,0 +1,40 @@
+## utility unit tests
+##
+
+Import('env')
+Import('env_cpp11')
+Import('boostlibs')
+Import('platform_libs')
+Import('polyfill_libs')
+
+env = env.Clone ()
+env_cpp11 = env_cpp11.Clone ()
+
+BOOST_LIBS = boostlibs(['unit_test_framework','system'],env) + [platform_libs]
+
+objs = env.Object('uri_boost.o', ["uri.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('utilities_boost.o', ["utilities.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('close_boost.o', ["close.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('sha1_boost.o', ["sha1.cpp"], LIBS = BOOST_LIBS)
+objs += env.Object('error_boost.o', ["error.cpp"], LIBS = BOOST_LIBS)
+prgs = env.Program('test_uri_boost', ["uri_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_utility_boost', ["utilities_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_frame', ["frame.cpp"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_close_boost', ["close_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_sha1_boost', ["sha1_boost.o"], LIBS = BOOST_LIBS)
+prgs += env.Program('test_error_boost', ["error_boost.o"], LIBS = BOOST_LIBS)
+
+if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
+   BOOST_LIBS_CPP11 = boostlibs(['unit_test_framework'],env_cpp11) + [platform_libs] + [polyfill_libs]
+   objs += env_cpp11.Object('utilities_stl.o', ["utilities.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('uri_stl.o', ["uri.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('close_stl.o', ["close.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('sha1_stl.o', ["sha1.cpp"], LIBS = BOOST_LIBS_CPP11)
+   objs += env_cpp11.Object('error_stl.o', ["error.cpp"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_utility_stl', ["utilities_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_uri_stl', ["uri_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_close_stl', ["close_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_sha1_stl', ["sha1_stl.o"], LIBS = BOOST_LIBS_CPP11)
+   prgs += env_cpp11.Program('test_error_stl', ["error_stl.o"], LIBS = BOOST_LIBS_CPP11)
+
+Return('prgs')
diff --git a/vendor/websocketpp/test/utility/close.cpp b/vendor/websocketpp/test/utility/close.cpp
new file mode 100644
index 0000000..81d7188
--- /dev/null
+++ b/vendor/websocketpp/test/utility/close.cpp
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE close
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/close.hpp>
+#include <websocketpp/utilities.hpp>
+
+using namespace websocketpp;
+
+BOOST_AUTO_TEST_CASE( reserved_values ) {
+    BOOST_CHECK( !close::status::reserved(999) );
+    BOOST_CHECK( close::status::reserved(1004) );
+    BOOST_CHECK( close::status::reserved(1014) );
+    BOOST_CHECK( close::status::reserved(1016) );
+    BOOST_CHECK( close::status::reserved(2999) );
+    BOOST_CHECK( !close::status::reserved(1000) );
+}
+
+BOOST_AUTO_TEST_CASE( invalid_values ) {
+    BOOST_CHECK( close::status::invalid(0) );
+    BOOST_CHECK( close::status::invalid(999) );
+    BOOST_CHECK( !close::status::invalid(1000) );
+    BOOST_CHECK( close::status::invalid(1005) );
+    BOOST_CHECK( close::status::invalid(1006) );
+    BOOST_CHECK( close::status::invalid(1015) );
+    BOOST_CHECK( !close::status::invalid(2999) );
+    BOOST_CHECK( !close::status::invalid(3000) );
+    BOOST_CHECK( close::status::invalid(5000) );
+}
+
+BOOST_AUTO_TEST_CASE( value_extraction ) {
+    lib::error_code ec;
+    std::string payload = "oo";
+
+    // Value = 1000
+    payload[0] = 0x03;
+    payload[1] = char(0xe8);
+    BOOST_CHECK( close::extract_code(payload,ec) == close::status::normal );
+    BOOST_CHECK( !ec );
+
+    // Value = 1004
+    payload[0] = 0x03;
+    payload[1] = char(0xec);
+    BOOST_CHECK( close::extract_code(payload,ec) == 1004 );
+    BOOST_CHECK( ec == error::reserved_close_code );
+
+    // Value = 1005
+    payload[0] = 0x03;
+    payload[1] = char(0xed);
+    BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
+    BOOST_CHECK( ec == error::invalid_close_code );
+
+    // Value = 3000
+    payload[0] = 0x0b;
+    payload[1] = char(0xb8);
+    BOOST_CHECK( close::extract_code(payload,ec) == 3000 );
+    BOOST_CHECK( !ec );
+}
+
+BOOST_AUTO_TEST_CASE( extract_empty ) {
+    lib::error_code ec;
+    std::string payload;
+
+    BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
+    BOOST_CHECK( !ec );
+}
+
+BOOST_AUTO_TEST_CASE( extract_short ) {
+    lib::error_code ec;
+    std::string payload = "0";
+
+    BOOST_CHECK( close::extract_code(payload,ec) == close::status::protocol_error );
+    BOOST_CHECK( ec == error::bad_close_code );
+}
+
+BOOST_AUTO_TEST_CASE( extract_reason ) {
+    lib::error_code ec;
+    std::string payload = "00Foo";
+
+    BOOST_CHECK( close::extract_reason(payload,ec) == "Foo" );
+    BOOST_CHECK( !ec );
+
+    payload.clear();
+    BOOST_CHECK( close::extract_reason(payload,ec).empty() );
+    BOOST_CHECK( !ec );
+
+    payload = "00";
+    BOOST_CHECK( close::extract_reason(payload,ec).empty() );
+    BOOST_CHECK( !ec );
+
+    payload = "000";
+    payload[2] = char(0xFF);
+
+    close::extract_reason(payload,ec);
+    BOOST_CHECK( ec == error::invalid_utf8 );
+}
diff --git a/vendor/websocketpp/test/utility/error.cpp b/vendor/websocketpp/test/utility/error.cpp
new file mode 100644
index 0000000..1379a95
--- /dev/null
+++ b/vendor/websocketpp/test/utility/error.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE error
+#include <boost/test/unit_test.hpp>
+
+#include <websocketpp/error.hpp>
+
+BOOST_AUTO_TEST_CASE( constructing_exceptions ) {
+    websocketpp::lib::error_code test_ec = websocketpp::error::make_error_code(websocketpp::error::test);
+    websocketpp::lib::error_code general_ec = websocketpp::error::make_error_code(websocketpp::error::general);
+
+    websocketpp::exception b("foo");
+    websocketpp::exception c("foo",test_ec);
+    websocketpp::exception d("");
+    websocketpp::exception e("",test_ec);
+
+    BOOST_CHECK_EQUAL(b.what(),"foo");
+    BOOST_CHECK_EQUAL(b.code(),general_ec);
+
+    BOOST_CHECK_EQUAL(c.what(),"foo");
+    BOOST_CHECK_EQUAL(c.code(),test_ec);
+
+    BOOST_CHECK_EQUAL(d.what(),"Generic error");
+    BOOST_CHECK_EQUAL(d.code(),general_ec);
+
+    BOOST_CHECK_EQUAL(e.what(),"Test Error");
+    BOOST_CHECK_EQUAL(e.code(),test_ec);
+}
+
diff --git a/vendor/websocketpp/test/utility/frame.cpp b/vendor/websocketpp/test/utility/frame.cpp
new file mode 100644
index 0000000..879c2ef
--- /dev/null
+++ b/vendor/websocketpp/test/utility/frame.cpp
@@ -0,0 +1,538 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE frame
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/frame.hpp>
+#include <websocketpp/utilities.hpp>
+
+using namespace websocketpp;
+
+BOOST_AUTO_TEST_CASE( basic_bits ) {
+    frame::basic_header h1(0x00,0x00); // all false
+    frame::basic_header h2(0xF0,0x80); // all true
+
+    // Read Values
+    BOOST_CHECK( frame::get_fin(h1) == false );
+    BOOST_CHECK( frame::get_rsv1(h1) == false );
+    BOOST_CHECK( frame::get_rsv2(h1) == false );
+    BOOST_CHECK( frame::get_rsv3(h1) == false );
+    BOOST_CHECK( frame::get_masked(h1) == false );
+
+    BOOST_CHECK( frame::get_fin(h2) == true );
+    BOOST_CHECK( frame::get_rsv1(h2) == true );
+    BOOST_CHECK( frame::get_rsv2(h2) == true );
+    BOOST_CHECK( frame::get_rsv3(h2) == true );
+    BOOST_CHECK( frame::get_masked(h2) == true );
+
+    // Set Values
+    frame::set_fin(h1,true);
+    BOOST_CHECK( h1.b0 == 0x80 );
+
+    frame::set_rsv1(h1,true);
+    BOOST_CHECK( h1.b0 == 0xC0 );
+
+    frame::set_rsv2(h1,true);
+    BOOST_CHECK( h1.b0 == 0xE0 );
+
+    frame::set_rsv3(h1,true);
+    BOOST_CHECK( h1.b0 == 0xF0 );
+
+    frame::set_masked(h1,true);
+    BOOST_CHECK( h1.b1 == 0x80 );
+}
+
+BOOST_AUTO_TEST_CASE( basic_constructors ) {
+    // Read Values
+    frame::basic_header h1(frame::opcode::TEXT,12,true,false);
+    BOOST_CHECK( frame::get_opcode(h1) == frame::opcode::TEXT );
+    BOOST_CHECK( frame::get_basic_size(h1) == 12 );
+    BOOST_CHECK( frame::get_fin(h1) == true );
+    BOOST_CHECK( frame::get_rsv1(h1) == false );
+    BOOST_CHECK( frame::get_rsv2(h1) == false );
+    BOOST_CHECK( frame::get_rsv3(h1) == false );
+    BOOST_CHECK( frame::get_masked(h1) == false );
+
+    frame::basic_header h2(frame::opcode::BINARY,0,false,false,false,true);
+    BOOST_CHECK( frame::get_opcode(h2) == frame::opcode::BINARY );
+    BOOST_CHECK( frame::get_basic_size(h2) == 0 );
+    BOOST_CHECK( frame::get_fin(h2) == false );
+    BOOST_CHECK( frame::get_rsv1(h2) == false );
+    BOOST_CHECK( frame::get_rsv2(h2) == true );
+    BOOST_CHECK( frame::get_rsv3(h2) == false );
+    BOOST_CHECK( frame::get_masked(h2) == false );
+}
+
+BOOST_AUTO_TEST_CASE( basic_size ) {
+    frame::basic_header h1(0x00,0x00); // length 0
+    frame::basic_header h2(0x00,0x01); // length 1
+    frame::basic_header h3(0x00,0x7D); // length 125
+    frame::basic_header h4(0x00,0x7E); // length 126
+    frame::basic_header h5(0x00,0x7F); // length 127
+    frame::basic_header h6(0x00,0x80); // length 0, mask bit set
+
+    BOOST_CHECK( frame::get_basic_size(h1) == 0 );
+    BOOST_CHECK( frame::get_basic_size(h2) == 1 );
+    BOOST_CHECK( frame::get_basic_size(h3) == 125 );
+    BOOST_CHECK( frame::get_basic_size(h4) == 126 );
+    BOOST_CHECK( frame::get_basic_size(h5) == 127 );
+    BOOST_CHECK( frame::get_basic_size(h6) == 0 );
+
+    /*frame::set_basic_size(h1,1);
+    BOOST_CHECK( h1.b1 == 0x01 );
+
+    frame::set_basic_size(h1,125);
+    BOOST_CHECK( h1.b1 == 0x7D );
+
+    frame::set_basic_size(h1,126);
+    BOOST_CHECK( h1.b1 == 0x7E );
+
+    frame::set_basic_size(h1,127);
+    BOOST_CHECK( h1.b1 == 0x7F );
+
+    frame::set_basic_size(h1,0);
+    BOOST_CHECK( h1.b1 == 0x00 );*/
+}
+
+BOOST_AUTO_TEST_CASE( basic_header_length ) {
+    frame::basic_header h1(0x82,0x00); // short binary frame, unmasked
+    frame::basic_header h2(0x82,0x80); // short binary frame, masked
+    frame::basic_header h3(0x82,0x7E); // medium binary frame, unmasked
+    frame::basic_header h4(0x82,0xFE); // medium binary frame, masked
+    frame::basic_header h5(0x82,0x7F); // jumbo binary frame, unmasked
+    frame::basic_header h6(0x82,0xFF); // jumbo binary frame, masked
+
+    BOOST_CHECK( frame::get_header_len(h1) == 2);
+    BOOST_CHECK( frame::get_header_len(h2) == 6);
+    BOOST_CHECK( frame::get_header_len(h3) == 4);
+    BOOST_CHECK( frame::get_header_len(h4) == 8);
+    BOOST_CHECK( frame::get_header_len(h5) == 10);
+    BOOST_CHECK( frame::get_header_len(h6) == 14);
+}
+
+BOOST_AUTO_TEST_CASE( basic_opcode ) {
+    frame::basic_header h1(0x00,0x00);
+
+    BOOST_CHECK( is_control(frame::opcode::CONTINUATION) == false);
+    BOOST_CHECK( is_control(frame::opcode::TEXT) == false);
+    BOOST_CHECK( is_control(frame::opcode::BINARY) == false);
+    BOOST_CHECK( is_control(frame::opcode::CLOSE) == true);
+    BOOST_CHECK( is_control(frame::opcode::PING) == true);
+    BOOST_CHECK( is_control(frame::opcode::PONG) == true);
+
+    BOOST_CHECK( frame::get_opcode(h1) == frame::opcode::CONTINUATION );
+}
+
+BOOST_AUTO_TEST_CASE( extended_header_basics ) {
+    frame::extended_header h1;
+    uint8_t h1_solution[12] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+    frame::extended_header h2(uint16_t(255));
+    uint8_t h2_solution[12] = {0x00, 0xFF, 0x00, 0x00, 0x00, 0x00,
+                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+    frame::extended_header h3(uint16_t(256),htonl(0x8040201));
+    uint8_t h3_solution[12] = {0x01, 0x00, 0x08, 0x04, 0x02, 0x01,
+                               0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+
+    frame::extended_header h4(uint64_t(0x0807060504030201LL));
+    uint8_t h4_solution[12] = {0x08, 0x07, 0x06, 0x05, 0x04, 0x03,
+                               0x02, 0x01, 0x00, 0x00, 0x00, 0x00};
+
+    frame::extended_header h5(uint64_t(0x0807060504030201LL),htonl(0x8040201));
+    uint8_t h5_solution[12] = {0x08, 0x07, 0x06, 0x05, 0x04, 0x03,
+                               0x02, 0x01, 0x08, 0x04, 0x02, 0x01};
+
+    BOOST_CHECK( std::equal(h1_solution,h1_solution+12,h1.bytes) );
+    BOOST_CHECK( std::equal(h2_solution,h2_solution+12,h2.bytes) );
+    BOOST_CHECK( std::equal(h3_solution,h3_solution+12,h3.bytes) );
+    BOOST_CHECK( std::equal(h4_solution,h4_solution+12,h4.bytes) );
+    BOOST_CHECK( std::equal(h5_solution,h5_solution+12,h5.bytes) );
+}
+
+BOOST_AUTO_TEST_CASE( extended_header_extractors ) {
+    frame::basic_header h1(0x00,0x7E);
+    frame::extended_header e1(uint16_t(255));
+    BOOST_CHECK( get_extended_size(e1) == 255 );
+    BOOST_CHECK( get_payload_size(h1,e1) == 255 );
+    BOOST_CHECK( get_masking_key_offset(h1) == 2 );
+    BOOST_CHECK( get_masking_key(h1,e1).i == 0 );
+
+    frame::basic_header h2(0x00,0x7F);
+    frame::extended_header e2(uint64_t(0x0807060504030201LL));
+    BOOST_CHECK( get_jumbo_size(e2) == 0x0807060504030201LL );
+    BOOST_CHECK( get_payload_size(h2,e2) == 0x0807060504030201LL );
+    BOOST_CHECK( get_masking_key_offset(h2) == 8 );
+    BOOST_CHECK( get_masking_key(h2,e2).i == 0 );
+
+    frame::basic_header h3(0x00,0xFE);
+    frame::extended_header e3(uint16_t(255),0x08040201);
+    BOOST_CHECK( get_extended_size(e3) == 255 );
+    BOOST_CHECK( get_payload_size(h3,e3) == 255 );
+    BOOST_CHECK( get_masking_key_offset(h3) == 2 );
+    BOOST_CHECK( get_masking_key(h3,e3).i == 0x08040201 );
+
+    frame::basic_header h4(0x00,0xFF);
+    frame::extended_header e4(uint64_t(0x0807060504030201LL),0x08040201);
+    BOOST_CHECK( get_jumbo_size(e4) == 0x0807060504030201LL );
+    BOOST_CHECK( get_payload_size(h4,e4) == 0x0807060504030201LL );
+    BOOST_CHECK( get_masking_key_offset(h4) == 8 );
+    BOOST_CHECK( get_masking_key(h4,e4).i == 0x08040201 );
+
+    frame::basic_header h5(0x00,0x7D);
+    frame::extended_header e5;
+    BOOST_CHECK( get_payload_size(h5,e5) == 125 );
+}
+
+BOOST_AUTO_TEST_CASE( header_preparation ) {
+    frame::basic_header h1(0x81,0xFF); //
+    frame::extended_header e1(uint64_t(0xFFFFFLL),htonl(0xD5FB70EE));
+    std::string p1 = prepare_header(h1, e1);
+    uint8_t s1[14] = {0x81, 0xFF,
+                     0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xFF,
+                     0xD5, 0xFB, 0x70, 0xEE};
+
+    BOOST_CHECK( p1.size() == 14);
+    BOOST_CHECK( std::equal(p1.begin(),p1.end(),reinterpret_cast<char*>(s1)) );
+
+    frame::basic_header h2(0x81,0x7E); //
+    frame::extended_header e2(uint16_t(255));
+    std::string p2 = prepare_header(h2, e2);
+    uint8_t s2[4] = {0x81, 0x7E, 0x00, 0xFF};
+
+    BOOST_CHECK( p2.size() == 4);
+    BOOST_CHECK( std::equal(p2.begin(),p2.end(),reinterpret_cast<char*>(s2)) );
+}
+
+BOOST_AUTO_TEST_CASE( prepare_masking_key ) {
+    frame::masking_key_type key;
+
+    key.i = htonl(0x12345678);
+
+    if (sizeof(size_t) == 8) {
+        BOOST_CHECK(
+            frame::prepare_masking_key(key) == lib::net::_htonll(0x1234567812345678LL)
+        );
+    } else {
+        BOOST_CHECK( frame::prepare_masking_key(key) == htonl(0x12345678) );
+    }
+}
+
+BOOST_AUTO_TEST_CASE( prepare_masking_key2 ) {
+    frame::masking_key_type key;
+
+    key.i = htonl(0xD5FB70EE);
+
+    // One call
+    if (sizeof(size_t) == 8) {
+        BOOST_CHECK(
+            frame::prepare_masking_key(key) == lib::net::_htonll(0xD5FB70EED5FB70EELL)
+        );
+    } else {
+        BOOST_CHECK( frame::prepare_masking_key(key) == htonl(0xD5FB70EE) );
+    }
+}
+
+// TODO: figure out a way to run/test both 4 and 8 byte versions.
+BOOST_AUTO_TEST_CASE( circshift ) {
+    /*if (sizeof(size_t) == 8) {
+        size_t test = 0x0123456789abcdef;
+
+        BOOST_CHECK( frame::circshift_prepared_key(test,0) == 0x0123456789abcdef);
+        BOOST_CHECK( frame::circshift_prepared_key(test,1) == 0xef0123456789abcd);
+        BOOST_CHECK( frame::circshift_prepared_key(test,2) == 0xcdef0123456789ab);
+        BOOST_CHECK( frame::circshift_prepared_key(test,3) == 0xabcdef0123456789);
+    } else {
+        size_t test = 0x01234567;
+
+        BOOST_CHECK( frame::circshift_prepared_key(test,0) == 0x01234567);
+        BOOST_CHECK( frame::circshift_prepared_key(test,1) == 0x67012345);
+        BOOST_CHECK( frame::circshift_prepared_key(test,2) == 0x45670123);
+        BOOST_CHECK( frame::circshift_prepared_key(test,3) == 0x23456701);
+    }*/
+}
+
+BOOST_AUTO_TEST_CASE( block_byte_mask ) {
+    uint8_t input[15] = {0x00, 0x00, 0x00, 0x00,
+                         0x00, 0x00, 0x00, 0x00,
+                         0x00, 0x00, 0x00, 0x00,
+                         0x00, 0x00, 0x00};
+
+    uint8_t output[15];
+
+    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02};
+
+    frame::masking_key_type key;
+    key.c[0] = 0x00;
+    key.c[1] = 0x01;
+    key.c[2] = 0x02;
+    key.c[3] = 0x03;
+
+    byte_mask(input,input+15,output,key);
+
+    BOOST_CHECK( std::equal(output,output+15,masked) );
+}
+
+BOOST_AUTO_TEST_CASE( block_byte_mask_inplace ) {
+    uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00};
+
+    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02};
+
+    frame::masking_key_type key;
+    key.c[0] = 0x00;
+    key.c[1] = 0x01;
+    key.c[2] = 0x02;
+    key.c[3] = 0x03;
+
+    byte_mask(buffer,buffer+15,key);
+
+    BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
+}
+
+BOOST_AUTO_TEST_CASE( block_word_mask ) {
+    uint8_t input[15] =  {0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00};
+
+    uint8_t output[15];
+
+    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02};
+
+    frame::masking_key_type key;
+    key.c[0] = 0x00;
+    key.c[1] = 0x01;
+    key.c[2] = 0x02;
+    key.c[3] = 0x03;
+
+    word_mask_exact(input,output,15,key);
+
+    BOOST_CHECK( std::equal(output,output+15,masked) );
+}
+
+BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
+    uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00, 0x00,
+                          0x00, 0x00, 0x00};
+
+    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02};
+
+    frame::masking_key_type key;
+    key.c[0] = 0x00;
+    key.c[1] = 0x01;
+    key.c[2] = 0x02;
+    key.c[3] = 0x03;
+
+    word_mask_exact(buffer,15,key);
+
+    BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
+}
+
+BOOST_AUTO_TEST_CASE( continuous_word_mask ) {
+    uint8_t input[16];
+    uint8_t output[16];
+
+    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x00};
+
+    frame::masking_key_type key;
+    key.c[0] = 0x00;
+    key.c[1] = 0x01;
+    key.c[2] = 0x02;
+    key.c[3] = 0x03;
+
+    // One call
+    size_t pkey,pkey_temp;
+    pkey = frame::prepare_masking_key(key);
+    std::fill_n(input,16,0x00);
+    std::fill_n(output,16,0x00);
+    frame::word_mask_circ(input,output,15,pkey);
+    BOOST_CHECK( std::equal(output,output+16,masked) );
+
+    // calls not split on word boundaries
+    pkey = frame::prepare_masking_key(key);
+    std::fill_n(input,16,0x00);
+    std::fill_n(output,16,0x00);
+
+    pkey_temp = frame::word_mask_circ(input,output,7,pkey);
+    BOOST_CHECK( std::equal(output,output+7,masked) );
+    BOOST_CHECK( pkey_temp == frame::circshift_prepared_key(pkey,3) );
+
+    pkey_temp = frame::word_mask_circ(input+7,output+7,8,pkey_temp);
+    BOOST_CHECK( std::equal(output,output+16,masked) );
+    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+}
+
+BOOST_AUTO_TEST_CASE( continuous_byte_mask ) {
+    uint8_t input[16];
+    uint8_t output[16];
+
+    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x00};
+
+    frame::masking_key_type key;
+    key.c[0] = 0x00;
+    key.c[1] = 0x01;
+    key.c[2] = 0x02;
+    key.c[3] = 0x03;
+
+    // One call
+    size_t pkey,pkey_temp;
+    pkey = frame::prepare_masking_key(key);
+    std::fill_n(input,16,0x00);
+    std::fill_n(output,16,0x00);
+    frame::byte_mask_circ(input,output,15,pkey);
+    BOOST_CHECK( std::equal(output,output+16,masked) );
+
+    // calls not split on word boundaries
+    pkey = frame::prepare_masking_key(key);
+    std::fill_n(input,16,0x00);
+    std::fill_n(output,16,0x00);
+
+    pkey_temp = frame::byte_mask_circ(input,output,7,pkey);
+    BOOST_CHECK( std::equal(output,output+7,masked) );
+    BOOST_CHECK( pkey_temp == frame::circshift_prepared_key(pkey,3) );
+
+    pkey_temp = frame::byte_mask_circ(input+7,output+7,8,pkey_temp);
+    BOOST_CHECK( std::equal(output,output+16,masked) );
+    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+}
+
+BOOST_AUTO_TEST_CASE( continuous_word_mask_inplace ) {
+    uint8_t buffer[16];
+
+    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x00};
+
+    frame::masking_key_type key;
+    key.c[0] = 0x00;
+    key.c[1] = 0x01;
+    key.c[2] = 0x02;
+    key.c[3] = 0x03;
+
+    // One call
+    size_t pkey,pkey_temp;
+    pkey = frame::prepare_masking_key(key);
+    std::fill_n(buffer,16,0x00);
+    frame::word_mask_circ(buffer,15,pkey);
+    BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
+
+    // calls not split on word boundaries
+    pkey = frame::prepare_masking_key(key);
+    std::fill_n(buffer,16,0x00);
+
+    pkey_temp = frame::word_mask_circ(buffer,7,pkey);
+    BOOST_CHECK( std::equal(buffer,buffer+7,masked) );
+    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+
+    pkey_temp = frame::word_mask_circ(buffer+7,8,pkey_temp);
+    BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
+    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+}
+
+BOOST_AUTO_TEST_CASE( continuous_byte_mask_inplace ) {
+    uint8_t buffer[16];
+
+    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x03,
+                          0x00, 0x01, 0x02, 0x00};
+
+    frame::masking_key_type key;
+    key.c[0] = 0x00;
+    key.c[1] = 0x01;
+    key.c[2] = 0x02;
+    key.c[3] = 0x03;
+
+    // One call
+    size_t pkey,pkey_temp;
+    pkey = frame::prepare_masking_key(key);
+    std::fill_n(buffer,16,0x00);
+    frame::byte_mask_circ(buffer,15,pkey);
+    BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
+
+    // calls not split on word boundaries
+    pkey = frame::prepare_masking_key(key);
+    std::fill_n(buffer,16,0x00);
+
+    pkey_temp = frame::byte_mask_circ(buffer,7,pkey);
+    BOOST_CHECK( std::equal(buffer,buffer+7,masked) );
+    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+
+    pkey_temp = frame::byte_mask_circ(buffer+7,8,pkey_temp);
+    BOOST_CHECK( std::equal(buffer,buffer+16,masked) );
+    BOOST_CHECK_EQUAL( pkey_temp, frame::circshift_prepared_key(pkey,3) );
+}
+
+BOOST_AUTO_TEST_CASE( continuous_word_mask2 ) {
+    uint8_t buffer[12] = {0xA6, 0x15, 0x97, 0xB9,
+                          0x81, 0x50, 0xAC, 0xBA,
+                          0x9C, 0x1C, 0x9F, 0xF4};
+
+    uint8_t unmasked[12] = {0x48, 0x65, 0x6C, 0x6C,
+                            0x6F, 0x20, 0x57, 0x6F,
+                            0x72, 0x6C, 0x64, 0x21};
+
+    frame::masking_key_type key;
+    key.c[0] = 0xEE;
+    key.c[1] = 0x70;
+    key.c[2] = 0xFB;
+    key.c[3] = 0xD5;
+
+    // One call
+    size_t pkey;
+    pkey = frame::prepare_masking_key(key);
+    frame::word_mask_circ(buffer,12,pkey);
+    BOOST_CHECK( std::equal(buffer,buffer+12,unmasked) );
+}
diff --git a/vendor/websocketpp/test/utility/sha1.cpp b/vendor/websocketpp/test/utility/sha1.cpp
new file mode 100644
index 0000000..ab25f97
--- /dev/null
+++ b/vendor/websocketpp/test/utility/sha1.cpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE sha1
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/sha1/sha1.hpp>
+#include <websocketpp/utilities.hpp>
+
+BOOST_AUTO_TEST_SUITE ( sha1 )
+
+BOOST_AUTO_TEST_CASE( sha1_test_a ) {
+    unsigned char hash[20];
+    unsigned char reference[20] = {0xa9, 0x99, 0x3e, 0x36, 0x47,
+                                   0x06, 0x81, 0x6a, 0xba, 0x3e,
+                                   0x25, 0x71, 0x78, 0x50, 0xc2,
+                                   0x6c, 0x9c, 0xd0, 0xd8, 0x9d};
+
+    websocketpp::sha1::calc("abc",3,hash);
+
+    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
+}
+
+BOOST_AUTO_TEST_CASE( sha1_test_b ) {
+    unsigned char hash[20];
+    unsigned char reference[20] = {0x84, 0x98, 0x3e, 0x44, 0x1c,
+                                   0x3b, 0xd2, 0x6e, 0xba, 0xae,
+                                   0x4a, 0xa1, 0xf9, 0x51, 0x29,
+                                   0xe5, 0xe5, 0x46, 0x70, 0xf1};
+
+    websocketpp::sha1::calc(
+        "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq",56,hash);
+
+    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
+}
+
+BOOST_AUTO_TEST_CASE( sha1_test_c ) {
+    std::string input;
+    unsigned char hash[20];
+    unsigned char reference[20] = {0x34, 0xaa, 0x97, 0x3c, 0xd4,
+                                   0xc4, 0xda, 0xa4, 0xf6, 0x1e,
+                                   0xeb, 0x2b, 0xdb, 0xad, 0x27,
+                                   0x31, 0x65, 0x34, 0x01, 0x6f};
+
+    for (int i = 0; i < 1000000; i++) {
+        input += 'a';
+    }
+
+    websocketpp::sha1::calc(input.c_str(),input.size(),hash);
+
+    BOOST_CHECK_EQUAL_COLLECTIONS(hash, hash+20, reference, reference+20);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/websocketpp/test/utility/uri.cpp b/vendor/websocketpp/test/utility/uri.cpp
new file mode 100644
index 0000000..2b0c886
--- /dev/null
+++ b/vendor/websocketpp/test/utility/uri.cpp
@@ -0,0 +1,246 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE uri
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/uri.hpp>
+
+// Test a regular valid ws URI
+BOOST_AUTO_TEST_CASE( uri_valid ) {
+    websocketpp::uri uri("ws://localhost:9000/chat");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( !uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "ws");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
+    BOOST_CHECK_EQUAL( uri.get_query(), "" );
+}
+
+// Test a regular valid ws URI
+BOOST_AUTO_TEST_CASE( uri_valid_no_port_unsecure ) {
+    websocketpp::uri uri("ws://localhost/chat");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( !uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "ws");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 80 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
+}
+
+// Valid URI with no port (secure)
+BOOST_AUTO_TEST_CASE( uri_valid_no_port_secure ) {
+    websocketpp::uri uri("wss://localhost/chat");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 443 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
+}
+
+// Valid URI with no resource
+BOOST_AUTO_TEST_CASE( uri_valid_no_resource ) {
+    websocketpp::uri uri("wss://localhost:9000");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
+}
+
+// Valid URI IPv6 Literal
+BOOST_AUTO_TEST_CASE( uri_valid_ipv6_literal ) {
+    websocketpp::uri uri("wss://[::1]:9000/chat");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "::1");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
+}
+
+// Valid URI with more complicated host
+BOOST_AUTO_TEST_CASE( uri_valid_2 ) {
+    websocketpp::uri uri("wss://thor-websocket.zaphoyd.net:88/");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "thor-websocket.zaphoyd.net");
+    BOOST_CHECK_EQUAL( uri.get_port(), 88 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
+}
+
+
+// Invalid URI (port too long)
+BOOST_AUTO_TEST_CASE( uri_invalid_long_port ) {
+    websocketpp::uri uri("wss://localhost:900000/chat");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Invalid URI (bogus scheme method)
+BOOST_AUTO_TEST_CASE( uri_invalid_scheme ) {
+    websocketpp::uri uri("foo://localhost:9000/chat");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Valid URI (http method)
+BOOST_AUTO_TEST_CASE( uri_http_scheme ) {
+    websocketpp::uri uri("http://localhost:9000/chat");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( !uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "http");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
+}
+
+// Valid URI IPv4 literal
+BOOST_AUTO_TEST_CASE( uri_valid_ipv4_literal ) {
+    websocketpp::uri uri("wss://127.0.0.1:9000/chat");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "127.0.0.1");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat" );
+}
+
+// Valid URI complicated resource path
+BOOST_AUTO_TEST_CASE( uri_valid_3 ) {
+    websocketpp::uri uri("wss://localhost:9000/chat/foo/bar");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss");
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar" );
+}
+
+// Invalid URI broken method separator
+BOOST_AUTO_TEST_CASE( uri_invalid_method_separator ) {
+    websocketpp::uri uri("wss:/localhost:9000/chat");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Invalid URI port > 65535
+BOOST_AUTO_TEST_CASE( uri_invalid_gt_16_bit_port ) {
+    websocketpp::uri uri("wss:/localhost:70000/chat");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Invalid URI includes uri fragment
+BOOST_AUTO_TEST_CASE( uri_invalid_fragment ) {
+    websocketpp::uri uri("wss:/localhost:70000/chat#foo");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Invalid URI with no brackets around IPv6 literal
+BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_1 ) {
+    websocketpp::uri uri("wss://::1/chat");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Invalid URI with port and no brackets around IPv6 literal
+BOOST_AUTO_TEST_CASE( uri_invalid_bad_v6_literal_2 ) {
+    websocketpp::uri uri("wss://::1:2009/chat");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Valid URI complicated resource path with query
+BOOST_AUTO_TEST_CASE( uri_valid_4 ) {
+    websocketpp::uri uri("wss://localhost:9000/chat/foo/bar?foo=bar");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
+    BOOST_CHECK_EQUAL( uri.get_host(), "localhost");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/chat/foo/bar?foo=bar" );
+    BOOST_CHECK_EQUAL( uri.get_query(), "foo=bar" );
+}
+
+// Valid URI with a mapped v4 ipv6 literal
+BOOST_AUTO_TEST_CASE( uri_valid_v4_mapped ) {
+    websocketpp::uri uri("wss://[0000:0000:0000:0000:0000:0000:192.168.1.1]:9000/");
+
+    BOOST_CHECK( uri.get_valid() );
+    BOOST_CHECK( uri.get_secure() );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
+    BOOST_CHECK_EQUAL( uri.get_host(), "0000:0000:0000:0000:0000:0000:192.168.1.1");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
+}
+
+// Valid URI with a v6 address with mixed case
+BOOST_AUTO_TEST_CASE( uri_valid_v6_mixed_case ) {
+    websocketpp::uri uri("wss://[::10aB]:9000/");
+
+    BOOST_CHECK( uri.get_valid() == true );
+    BOOST_CHECK( uri.get_secure() == true );
+    BOOST_CHECK_EQUAL( uri.get_scheme(), "wss" );
+    BOOST_CHECK_EQUAL( uri.get_host(), "::10aB");
+    BOOST_CHECK_EQUAL( uri.get_port(), 9000 );
+    BOOST_CHECK_EQUAL( uri.get_resource(), "/" );
+}
+
+// Valid URI with a v6 address with mixed case
+BOOST_AUTO_TEST_CASE( uri_invalid_no_scheme ) {
+    websocketpp::uri uri("myserver.com");
+
+    BOOST_CHECK( !uri.get_valid() );
+}
+
+// Invalid IPv6 literal
+/*BOOST_AUTO_TEST_CASE( uri_invalid_v6_nonhex ) {
+    websocketpp::uri uri("wss://[g::1]:9000/");
+
+    BOOST_CHECK( uri.get_valid() == false );
+}*/
+
+// TODO: tests for the other two constructors
diff --git a/vendor/websocketpp/test/utility/utilities.cpp b/vendor/websocketpp/test/utility/utilities.cpp
new file mode 100644
index 0000000..8cbb8c3
--- /dev/null
+++ b/vendor/websocketpp/test/utility/utilities.cpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2011, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+//#define BOOST_TEST_DYN_LINK
+#define BOOST_TEST_MODULE utility
+#include <boost/test/unit_test.hpp>
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/utilities.hpp>
+
+BOOST_AUTO_TEST_SUITE ( utility )
+
+BOOST_AUTO_TEST_CASE( substr_found ) {
+    std::string haystack = "abc123";
+    std::string needle = "abc";
+
+    BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) ==haystack.begin());
+}
+
+BOOST_AUTO_TEST_CASE( substr_found_ci ) {
+    std::string haystack = "abc123";
+    std::string needle = "aBc";
+
+    BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) ==haystack.begin());
+}
+
+BOOST_AUTO_TEST_CASE( substr_not_found ) {
+    std::string haystack = "abd123";
+    std::string needle = "abcd";
+
+    BOOST_CHECK(websocketpp::utility::ci_find_substr(haystack,needle) == haystack.end());
+}
+
+BOOST_AUTO_TEST_CASE( to_lower ) {
+    std::string in = "AbCd";
+
+    BOOST_CHECK_EQUAL(websocketpp::utility::to_lower(in), "abcd");
+}
+
+BOOST_AUTO_TEST_CASE( string_replace_all ) {
+    std::string source = "foo \"bar\" baz";
+    std::string dest = "foo \\\"bar\\\" baz";
+
+    using websocketpp::utility::string_replace_all;
+    BOOST_CHECK_EQUAL(string_replace_all(source,"\"","\\\""),dest);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/vendor/websocketpp/tutorials/broadcast_tutorial/broadcast_tutorial.md b/vendor/websocketpp/tutorials/broadcast_tutorial/broadcast_tutorial.md
new file mode 100644
index 0000000..02e5001
--- /dev/null
+++ b/vendor/websocketpp/tutorials/broadcast_tutorial/broadcast_tutorial.md
@@ -0,0 +1,17 @@
+Broadcast Tutorial
+==================
+
+This tutorial will dig into some more nitty gritty details on how to build high
+scalability, high performance websocket servers for broadcast like workflows.
+
+Will go into features like:
+- minimizing work done in handlers
+- using asio thread pool mode
+- teaming multiple endpoints
+- setting accept queue depth
+- tuning compile time buffer sizes
+- prepared messages
+- flow control
+- basic operating system level tuning, particularly increasing file descriptor limits.
+- measuring performance with wsperf / autobahn
+- tuning permessage-deflate compression settings
\ No newline at end of file
diff --git a/vendor/websocketpp/tutorials/chat_tutorial/chat_tutorial.md b/vendor/websocketpp/tutorials/chat_tutorial/chat_tutorial.md
new file mode 100644
index 0000000..042837c
--- /dev/null
+++ b/vendor/websocketpp/tutorials/chat_tutorial/chat_tutorial.md
@@ -0,0 +1,13 @@
+Chat Tutorial
+=============
+
+Goals of this tutorial:
+- Implement a realtime websocket chat server
+
+
+Server
+- Nicknames
+- Channels
+- Subprotocol
+- Origin restrictions
+- HTTP statistics page
diff --git a/vendor/websocketpp/tutorials/utility_client/step1.cpp b/vendor/websocketpp/tutorials/utility_client/step1.cpp
new file mode 100644
index 0000000..9c8fad9
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_client/step1.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <iostream>
+#include <string>
+
+int main() {
+    bool done = false;
+    std::string input;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout 
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
diff --git a/vendor/websocketpp/tutorials/utility_client/step2.cpp b/vendor/websocketpp/tutorials/utility_client/step2.cpp
new file mode 100644
index 0000000..a1e5796
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_client/step2.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <iostream>
+#include <string>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+int main() {
+    bool done = false;
+    std::string input;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
diff --git a/vendor/websocketpp/tutorials/utility_client/step3.cpp b/vendor/websocketpp/tutorials/utility_client/step3.cpp
new file mode 100644
index 0000000..82e652f
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_client/step3.cpp
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <iostream>
+#include <string>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+    }
+private:
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout 
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
diff --git a/vendor/websocketpp/tutorials/utility_client/step4.cpp b/vendor/websocketpp/tutorials/utility_client/step4.cpp
new file mode 100644
index 0000000..73aee65
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_client/step4.cpp
@@ -0,0 +1,202 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class connection_metadata {
+public:
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
+private:
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
+};
+
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+
+/*
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a
+
+clang++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_thread.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_random.a
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/Documents/websocketpp/ -I/Users/zaphoyd/Documents/boost_1_53_0_libcpp/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/Documents/boost_1_53_0_libcpp/stage/lib/libboost_system.a
+
+*/
diff --git a/vendor/websocketpp/tutorials/utility_client/step5.cpp b/vendor/websocketpp/tutorials/utility_client/step5.cpp
new file mode 100644
index 0000000..3e57b3c
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_client/step5.cpp
@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class connection_metadata {
+public:
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
+    }
+    
+    void on_close(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Closed";
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        std::stringstream s;
+        s << "close code: " << con->get_remote_close_code() << " (" 
+          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
+          << "), close reason: " << con->get_remote_close_reason();
+        m_error_reason = s.str();
+    }
+
+    websocketpp::connection_hdl get_hdl() const {
+        return m_hdl;
+    }
+    
+    int get_id() const {
+        return m_id;
+    }
+    
+    std::string get_status() const {
+        return m_status;
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
+private:
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
+};
+
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+    }
+
+    ~websocket_endpoint() {
+        m_endpoint.stop_perpetual();
+        
+        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
+            if (it->second->get_status() != "Open") {
+                // Only close open connections
+                continue;
+            }
+            
+            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
+            
+            websocketpp::lib::error_code ec;
+            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
+            if (ec) {
+                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
+                          << ec.message() << std::endl;
+            }
+        }
+        
+        m_thread->join();
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_close_handler(websocketpp::lib::bind(
+            &connection_metadata::on_close,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    void close(int id, websocketpp::close::status::value code, std::string reason) {
+        websocketpp::lib::error_code ec;
+        
+        con_list::iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            std::cout << "> No connection found with id " << id << std::endl;
+            return;
+        }
+        
+        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
+        if (ec) {
+            std::cout << "> Error initiating close: " << ec.message() << std::endl;
+        }
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,5) == "close") {
+            std::stringstream ss(input);
+            
+            std::string cmd;
+            int id;
+            int close_code = websocketpp::close::status::normal;
+            std::string reason;
+            
+            ss >> cmd >> id >> close_code;
+            std::getline(ss,reason);
+            
+            endpoint.close(id, close_code, reason);
+        }  else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+
+/*
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a
+
+clang++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_thread.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_random.a
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/Documents/websocketpp/ -I/Users/zaphoyd/Documents/boost_1_53_0_libcpp/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/Documents/boost_1_53_0_libcpp/stage/lib/libboost_system.a
+
+*/
diff --git a/vendor/websocketpp/tutorials/utility_client/step6.cpp b/vendor/websocketpp/tutorials/utility_client/step6.cpp
new file mode 100644
index 0000000..208b95d
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_client/step6.cpp
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility client tutorial.
+// Additional related material can be found in the tutorials/utility_client
+// directory of the WebSocket++ repository.
+
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class connection_metadata {
+public:
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
+    }
+    
+    void on_close(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Closed";
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        std::stringstream s;
+        s << "close code: " << con->get_remote_close_code() << " (" 
+          << websocketpp::close::status::get_string(con->get_remote_close_code()) 
+          << "), close reason: " << con->get_remote_close_reason();
+        m_error_reason = s.str();
+    }
+
+    void on_message(websocketpp::connection_hdl, client::message_ptr msg) {
+        if (msg->get_opcode() == websocketpp::frame::opcode::text) {
+            m_messages.push_back("<< " + msg->get_payload());
+        } else {
+            m_messages.push_back("<< " + websocketpp::utility::to_hex(msg->get_payload()));
+        }
+    }
+
+    websocketpp::connection_hdl get_hdl() const {
+        return m_hdl;
+    }
+    
+    int get_id() const {
+        return m_id;
+    }
+    
+    std::string get_status() const {
+        return m_status;
+    }
+
+    void record_sent_message(std::string message) {
+        m_messages.push_back(">> " + message);
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
+private:
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
+    std::vector<std::string> m_messages;
+};
+
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason) << "\n";
+    out << "> Messages Processed: (" << data.m_messages.size() << ") \n";
+
+    std::vector<std::string>::const_iterator it;
+    for (it = data.m_messages.begin(); it != data.m_messages.end(); ++it) {
+        out << *it << "\n";
+    }
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+    }
+
+    ~websocket_endpoint() {
+        m_endpoint.stop_perpetual();
+        
+        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
+            if (it->second->get_status() != "Open") {
+                // Only close open connections
+                continue;
+            }
+            
+            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
+            
+            websocketpp::lib::error_code ec;
+            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
+            if (ec) {
+                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
+                          << ec.message() << std::endl;
+            }
+        }
+        
+        m_thread->join();
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_close_handler(websocketpp::lib::bind(
+            &connection_metadata::on_close,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_message_handler(websocketpp::lib::bind(
+            &connection_metadata::on_message,
+            metadata_ptr,
+            websocketpp::lib::placeholders::_1,
+            websocketpp::lib::placeholders::_2
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    void close(int id, websocketpp::close::status::value code, std::string reason) {
+        websocketpp::lib::error_code ec;
+        
+        con_list::iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            std::cout << "> No connection found with id " << id << std::endl;
+            return;
+        }
+        
+        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
+        if (ec) {
+            std::cout << "> Error initiating close: " << ec.message() << std::endl;
+        }
+    }
+
+    void send(int id, std::string message) {
+        websocketpp::lib::error_code ec;
+        
+        con_list::iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            std::cout << "> No connection found with id " << id << std::endl;
+            return;
+        }
+        
+        m_endpoint.send(metadata_it->second->get_hdl(), message, websocketpp::frame::opcode::text, ec);
+        if (ec) {
+            std::cout << "> Error sending message: " << ec.message() << std::endl;
+            return;
+        }
+        
+        metadata_it->second->record_sent_message(message);
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "send <connection id> <message>\n"
+                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,4) == "send") {
+            std::stringstream ss(input);
+            
+            std::string cmd;
+            int id;
+            std::string message;
+            
+            ss >> cmd >> id;
+            std::getline(ss,message);
+            
+            endpoint.send(id, message);
+        } else if (input.substr(0,5) == "close") {
+            std::stringstream ss(input);
+            
+            std::string cmd;
+            int id;
+            int close_code = websocketpp::close::status::normal;
+            std::string reason;
+            
+            ss >> cmd >> id >> close_code;
+            std::getline(ss,reason);
+            
+            endpoint.close(id, close_code, reason);
+        } else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+
+/*
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a
+
+clang++ -I/Users/zaphoyd/software/websocketpp/ -I/Users/zaphoyd/software/boost_1_55_0/ step4.cpp /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_system.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_thread.a /Users/zaphoyd/software/boost_1_55_0/stage/lib/libboost_random.a
+
+clang++ -std=c++11 -stdlib=libc++ -I/Users/zaphoyd/Documents/websocketpp/ -I/Users/zaphoyd/Documents/boost_1_53_0_libcpp/ -D_WEBSOCKETPP_CPP11_STL_ step4.cpp /Users/zaphoyd/Documents/boost_1_53_0_libcpp/stage/lib/libboost_system.a
+
+*/
diff --git a/vendor/websocketpp/tutorials/utility_client/utility_client.md b/vendor/websocketpp/tutorials/utility_client/utility_client.md
new file mode 100644
index 0000000..696113d
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_client/utility_client.md
@@ -0,0 +1,862 @@
+Utility Client Example Application Tutorial
+===========================================
+
+Chapter 1: Initial Setup & Basics
+---------------------------------
+
+Setting up the basic types, opening and closing connections, sending and receiving messages.
+
+### Step 1
+
+A basic program loop that prompts the user for a command and then processes it. In this tutorial we will modify this program to perform tasks and retrieve data from a remote server over a WebSocket connection.
+
+#### Build
+`clang++ step1.cpp`
+
+#### Code so far
+
+*note* A code snapshot for each step is present next to this tutorial file in the git repository.
+
+~~~{.cpp}
+#include <iostream>
+#include <string>
+
+int main() {
+    bool done = false;
+    std::string input;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+~~~
+
+### Step 2
+
+_Add WebSocket++ includes and set up an endpoint type._
+
+WebSocket++ includes two major object types. The endpoint and the connection. The
+endpoint creates and launches new connections and maintains default settings for
+those connections. Endpoints also manage any shared network resources.
+
+The connection stores information specific to each WebSocket session.
+
+> **Note:** Once a connection is launched, there is no link between the endpoint and the connection. All default settings are copied into the new connection by the endpoint. Changing default settings on an endpoint will only affect future connections.
+Connections do not maintain a link back to their associated endpoint. Endpoints do not maintain a list of outstanding connections. If your application needs to iterate over all connections it will need to maintain a list of them itself.
+
+WebSocket++ endpoints are built by combining an endpoint role with an endpoint config. There are two different types of endpoint roles, one each for the client and server roles in a WebSocket session. This is a client tutorial so we will use the client role `websocketpp::client` which is provided by the `<websocketpp/client.hpp>` header.
+
+> ##### Terminology: Endpoint Config
+> WebSocket++ endpoints have a group of settings that may be configured at compile time via the `config` template parameter. A config is a struct that contains types and static constants that are used to produce an endpoint with specific properties. Depending on which config is being used the endpoint will have different methods available and may have additional third party dependencies.
+
+The endpoint role takes a template parameter called `config` that is used to configure the behavior of endpoint at compile time. For this example we are going to use a default config provided by the library called `asio_client`, provided by `<websocketpp/config/asio_no_tls_client.hpp>`. This is a client config that uses boost::asio to provide network transport and does not support TLS based security. Later on we will discuss how to introduce TLS based security into a WebSocket++ application, more about the other stock configs, and how to build your own custom configs.
+
+Combine a config with an endpoint role to produce a fully configured endpoint. This type will be used frequently so I would recommend a typedef here.
+
+`typedef websocketpp::client<websocketpp::config::asio_client> client`
+
+#### Build
+Adding WebSocket++ has added a few dependencies to our program that must be addressed in the build system. Firstly, the WebSocket++ and Boost library headers must be in the include search path of your build system. How exactly this is done depends on where you have the WebSocket++ headers installed and what build system you are using.
+
+In addition to the new headers, boost::asio depends on the `boost_system` shared library. This will need to be added (either as a static or dynamic) to the linker. Refer to your build environment documentation for instructions on linking to shared libraries.
+
+`clang++ step2.cpp -lboost_system`
+
+#### Code so far
+~~~{.cpp}
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <iostream>
+#include <string>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+int main() {
+    bool done = false;
+    std::string input;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+~~~
+
+### Step 3
+
+_Create endpoint wrapper object that handles initialization and setting up the background thread._
+
+In order to process user input while network processing occurs in the background we are going to use a separate thread for the WebSocket++ processing loop. This leaves the main thread free to process foreground user input. In order to enable simple RAII style resource management for our thread and endpoint we will use a wrapper object that configures them both in its constructor.
+
+> ##### Terminology: websocketpp::lib namespace
+> WebSocket++ is designed to be used with a C++11 standard library. As this is not universally available in popular build systems the Boost libraries may be used as polyfills for the C++11 standard library in C++98 build environments. The `websocketpp::lib` namespace is used by the library and its associated examples to abstract away the distinctions between the two. `websocketpp::lib::shared_ptr` will evaluate to `std::shared_ptr` in a C++11 environment and `boost::shared_ptr` otherwise.
+>
+> This tutorial uses the `websocketpp::lib` wrappers because it doesn't know what the build environment of the reader is. For your applications, unless you are interested in similar portability, are free to use the boost or std versions of these types directly.
+>
+>[TODO: link to more information about websocketpp::lib namespace and C++11 setup]
+
+Within the `websocket_endpoint` constructor several things happen:
+
+First, we set the endpoint logging behavior to silent by clearing all of the access and error logging channels. [TODO: link to more information about logging]
+~~~{.cpp}
+m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+~~~
+
+Next, we initialize the transport system underlying the endpoint and set it to perpetual mode. In perpetual mode the endpoint's processing loop will not exit automatically when it has no connections. This is important because we want this endpoint to remain active while our application is running and process requests for new WebSocket connections on demand as we need them. Both of these methods are specific to the asio transport. They will not be  necessary or present in endpoints that use a non-asio config.
+~~~{.cpp}
+m_endpoint.init_asio();
+m_endpoint.start_perpetual();
+~~~
+
+Finally, we launch a thread to run the `run` method of our client endpoint. While the endpoint is running it will process connection tasks (read and deliver incoming messages, frame and send outgoing messages, etc). Because it is running in perpetual mode, when there are no connections active it will wait for a new connection.
+~~~{.cpp}
+m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
+~~~
+
+#### Build
+
+Now that our client endpoint template is actually instantiated a few more linker dependencies will show up. In particular, WebSocket clients require a cryptographically secure random number generator. WebSocket++ is able to use either `boost_random` or the C++11 standard library <random> for this purpose. Because this example also uses threads, if we do not have C++11 std::thread available we will need to include `boost_thread`.
+
+##### Clang (C++98 & boost)
+`clang++ step3.cpp -lboost_system -lboost_random -lboost_thread`
+
+##### Clang (C++11)
+`clang++ -std=c++0x -stdlib=libc++ step3.cpp -lboost_system -D_WEBSOCKETPP_CPP11_STL_`
+
+##### G++ (C++98 & Boost)
+`g++ step3.cpp -lboost_system -lboost_random -lboost_thread`
+
+##### G++ v4.6+ (C++11)
+`g++ -std=c++0x step3.cpp -lboost_system -D_WEBSOCKETPP_CPP11_STL_`
+
+#### Code so far
+
+~~~{.cpp}
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <iostream>
+#include <string>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
+    }
+private:
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else {
+            std::cout << "Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+~~~
+
+### Step 4
+
+_Opening WebSocket connections_
+
+This step adds two new commands to utility_client. The ability to open a new connection and the ability to view information about a previously opened connection. Every connection that gets opened will be assigned an integer connection id that the user of the program can use to interact with that connection.
+
+#### New Connection Metadata Object
+
+In order to track information about each connection a `connection_metadata` object is defined. This object stores the numeric connection id and a number of fields that will be filled in as the connection is processed. Initially this includes the state of the connection (opening, open, failed, closed, etc), the original URI connected to, an identifying value from the server, and a description of the reason for connection failure/closure. Future steps will add more information to this metadata object.
+
+#### Update `websocket_endpoint`
+
+The `websocket_endpoint` object has gained some new data members and methods. It now tracks a mapping between connection IDs and their associated metadata as well as the next sequential ID number to hand out. The `connect()` method initiates a new connection. The `get_metadata` method retrieves metadata given an ID.
+
+#### The connect method
+A new WebSocket connection is initiated via a three step process. First, a connection request is created by `endpoint::get_connection(uri)`. Next, the connection request is configured. Lastly, the connection request is submitted back to the endpoint via `endpoint::connect()` which adds it to the queue of new connections to make.
+
+> ##### Terminology `connection_ptr`
+> WebSocket++ keeps track of connection related resources using a reference counted shared pointer. The type of this pointer is `endpoint::connection_ptr`. A `connection_ptr` allows direct access to information about the connection and allows changing connection settings. Because of this direct access and their internal resource management role within the library it is not safe for end applications to use `connection_ptr` except in the specific circumstances detailed below.
+>
+> **When is it safe to use `connection_ptr`?**
+> - After `endpoint::get_connection(...)` and before `endpoint::connect()`: `get_connection` returns a `connection_ptr`. It is safe to use this pointer to configure your new connection. Once you submit the connection to `connect` you may no longer use the `connection_ptr` and should discard it immediately for optimal memory management.
+> - During a handler: WebSocket++ allows you to register hooks / callbacks / event handlers for specific events that happen during a connection's lifetime. During the invocation of one of these handlers the library guarantees that it is safe to use a `connection_ptr` for the connection associated with the currently running handler.
+
+> ##### Terminology `connection_hdl`
+> Because of the limited thread safety of the `connection_ptr` the library also provides a more flexible connection identifier, the `connection_hdl`. The `connection_hdl` has type `websocketpp::connection_hdl` and it is defined in `<websocketpp/common/connection_hdl.hpp>`. Note that unlike `connection_ptr` this is not dependent on the type or config of the endpoint. Code that simply stores or transmits `connection_hdl` but does not use them can include only the header above and can treat its hdls like values.
+>
+> Connection handles are not used directly. They are used by endpoint methods to identify the target of the desired action. For example, the endpoint method that sends a new message will take as a parameter the hdl of the connection to send the message to.
+>
+> **When is it safe to use `connection_hdl`?**
+> `connection_hdl`s may be used at any time from any thread. They may be copied and stored in containers. Deleting a hdl will not affect the connection in any way. Handles may be upgraded to a `connection_ptr` during a handler call by using `endpoint::get_con_from_hdl()`. The resulting `connection_ptr` is safe to use for the duration of that handler invocation.
+>
+> **`connection_hdl` FAQs**
+> - `connection_hdl`s are guaranteed to be unique within a program. Multiple endpoints in a single program will always create connections with unique handles.
+> - Using a `connection_hdl` with a different endpoint than the one that created its associated connection will result in undefined behavior.
+> - Using a `connection_hdl` whose associated connection has been closed or deleted is safe. The endpoint will return a specific error saying the operation couldn't be completed because the associated connection doesn't exist.
+> [TODO: more here? link to a connection_hdl FAQ elsewhere?]
+
+`websocket_endpoint::connect()` begins by calling `endpoint::get_connection()` using a uri passed as a parameter. Additionally, an error output value is passed to capture any errors that might occur during. If an error does occur an error notice is printed along with a descriptive message and the -1 / 'invalid' value is returned as the new ID.
+
+> ###### Terminology: `error handling: exceptions vs error_code`
+> WebSocket++ uses the error code system defined by the C++11 `<system_error>` library. It can optionally fall back to a similar system provided by the Boost libraries. All user facing endpoint methods that can fail take an `error_code` in an output parameter and store the error that occured there before returning. An empty/default constructed value is returned in the case of success.
+>
+> **Exception throwing varients**
+> All user facing endpoint methods that take and use an `error_code` parameter have a version that throws an exception instead. These methods are identical in function and signature except for the lack of the final ec parameter. The type of the exception thrown is `websocketpp::exception`. This type derives from `std::exception` so it can be caught by catch blocks grabbing generic `std::exception`s. The `websocketpp::exception::code()` method may be used to extract the machine readable `error_code` value from an exception.
+>
+> For clarity about error handling the utility_client example uses exclusively the exception free varients of these methods. Your application may choose to use either.
+
+If connection creation succeeds, the next sequential connection ID is generated and a `connection_metadata` object is inserted into the connection list under that ID. Initially the metadata object stores the connection ID, the `connection_hdl`, and the URI the connection was opened to.
+
+~~~{.cpp}
+int new_id = m_next_id++;
+metadata_ptr metadata(new connection_metadata(new_id, con->get_handle(), uri));
+m_connection_list[new_id] = metadata;
+~~~
+
+Next, the connection request is configured. For this step the only configuration we will do is setting up a few default handlers. Later on we will return and demonstrate some more detailed configuration that can happen here (setting user agents, origin, proxies, custom headers, subprotocols, etc).
+
+> ##### Terminology: Registering handlers
+> WebSocket++ provides a number of execution points where you can register to have a handler run. Which of these points are available to your endpoint will depend on its config. TLS handlers will not exist on non-TLS endpoints for example. A complete list of handlers can be found at  http://www.zaphoyd.com/websocketpp/manual/reference/handler-list.
+>
+> Handlers can be registered at the endpoint level and at the connection level. Endpoint handlers are copied into new connections as they are created. Changing an endpoint handler will affect only future connections. Handlers registered at the connection level will be bound to that specific connection only.
+>
+> The signature of handler binding methods is the same for endpoints and connections. The format is: `set_*_handler(...)`. Where * is the name of the handler. For example, `set_open_handler(...)` will set the handler to be called when a new connection is open. `set_fail_handler(...)` will set the handler to be called when a connection fails to connect.
+>
+> All handlers take one argument, a callable type that can be converted to a `std::function` with the correct count and type of arguments. You can pass free functions, functors, and Lambdas with matching argument lists as handlers. In addition, you can use `std::bind` (or `boost::bind`) to register functions with non-matching argument lists. This is useful for passing additional parameters not present in the handler signature or member functions that need to carry a 'this' pointer.
+>
+> The function signature of each handler can be looked up in the list above in the manual. In general, all handlers include the `connection_hdl` identifying which connection this even is associated with as the first parameter. Some handlers (such as the message handler) include additional parameters. Most handlers have a void return value but some (`validate`, `ping`, `tls_init`) do not. The specific meanings of the return values are documented in the handler list linked above.
+
+`utility_client` registers an open and a fail handler. We will use these to track whether each connection was successfully opened or failed. If it successfully opens, we will gather some information from the opening handshake and store it with our connection metadata.
+
+In this example we are going to set connection specific handlers that are bound directly to the metadata object associated with our connection. This allows us to avoid performing a lookup in each handler to find the metadata object we plan to update which is a bit more efficient.
+
+Lets look at the parameters being sent to bind in detail:
+
+~~~{.cpp}
+con->set_open_handler(websocketpp::lib::bind(
+    &connection_metadata::on_open,
+    metadata,
+    &m_endpoint,
+    websocketpp::lib::placeholders::_1
+));
+~~~
+
+`&connection_metadata::on_open` is the address of the `on_open` member function of the `connection_metadata` class. `metadata_ptr` is a pointer to the `connection_metadata` object associated with this class. It will be used as the object on which the `on_open` member function will be called. `&m_endpoint` is the address of the endpoint in use. This parameter will be passed as-is to the `on_open` method. Lastly, `websocketpp::lib::placeholders::_1` is a placeholder indicating that the bound function should take one additional argument to be filled in at a later time. WebSocket++ will fill in this placeholder with the `connection_hdl` when it invokes the handler.
+
+Finally, we call `endpoint::connect()` on our configured connection request and return the new connection ID.
+
+#### Handler Member Functions
+
+The open handler we registered, `connection_metadata::on_open`, sets the status metadata field to "Open" and retrieves the value of the "Server" header from the remote endpoint's HTTP response and stores it in the metadata object. Servers often set an identifying string in this header.
+
+The fail handler we registered, `connection_metadata::on_fail`, sets the status metadata field to "Failed", the server field similarly to `on_open`, and retrieves the error code describing why the connection failed. The human readable message associated with that error code is saved to the metadata object.
+
+#### New Commands
+
+Two new commands have been set up. "connect [uri]" will pass the URI to the `websocket_endpoint` connect method and report an error or the connection ID of the new connection. "show [connection id]" will retrieve and print out the metadata associated with that connection. The help text has been updated accordingly.
+
+~~~{.cpp}
+} else if (input.substr(0,7) == "connect") {
+    int id = endpoint.connect(input.substr(8));
+    if (id != -1) {
+        std::cout << "> Created connection with id " << id << std::endl;
+    }
+} else if (input.substr(0,4) == "show") {
+    int id = atoi(input.substr(5).c_str());
+
+    connection_metadata::ptr metadata = endpoint.get_metadata(id);
+    if (metadata) {
+        std::cout << *metadata << std::endl;
+    } else {
+        std::cout << "> Unknown connection id " << id << std::endl;
+    }
+}
+~~~
+
+#### Build
+
+There are no changes to the build instructions from step 3
+
+#### Run
+
+~~~
+Enter Command: connect not a websocket uri
+> Connect initialization error: invalid uri
+Enter Command: show 0
+> Unknown connection id 0
+Enter Command: connect ws://echo.websocket.org
+> Created connection with id 0
+Enter Command: show 0
+> URI: ws://echo.websocket.org
+> Status: Open
+> Remote Server: Kaazing Gateway
+> Error/close reason: N/A
+Enter Command: connect ws://wikipedia.org
+> Created connection with id 1
+Enter Command: show 1
+> URI: ws://wikipedia.org
+> Status: Failed
+> Remote Server: Apache
+> Error/close reason: Invalid HTTP status.
+~~~
+
+#### Code so far
+
+~~~{.cpp}
+#include <websocketpp/config/asio_no_tls_client.hpp>
+#include <websocketpp/client.hpp>
+
+#include <websocketpp/common/thread.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <cstdlib>
+#include <iostream>
+#include <map>
+#include <string>
+#include <sstream>
+
+typedef websocketpp::client<websocketpp::config::asio_client> client;
+
+class connection_metadata {
+public:
+    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+
+    connection_metadata(int id, websocketpp::connection_hdl hdl, std::string uri)
+      : m_id(id)
+      , m_hdl(hdl)
+      , m_status("Connecting")
+      , m_uri(uri)
+      , m_server("N/A")
+    {}
+
+    void on_open(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Open";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+    }
+
+    void on_fail(client * c, websocketpp::connection_hdl hdl) {
+        m_status = "Failed";
+
+        client::connection_ptr con = c->get_con_from_hdl(hdl);
+        m_server = con->get_response_header("Server");
+        m_error_reason = con->get_ec().message();
+    }
+
+    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
+private:
+    int m_id;
+    websocketpp::connection_hdl m_hdl;
+    std::string m_status;
+    std::string m_uri;
+    std::string m_server;
+    std::string m_error_reason;
+};
+
+std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
+    out << "> URI: " << data.m_uri << "\n"
+        << "> Status: " << data.m_status << "\n"
+        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
+
+    return out;
+}
+
+class websocket_endpoint {
+public:
+    websocket_endpoint () : m_next_id(0) {
+        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
+        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
+
+        m_endpoint.init_asio();
+        m_endpoint.start_perpetual();
+
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
+    }
+
+    int connect(std::string const & uri) {
+        websocketpp::lib::error_code ec;
+
+        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
+
+        if (ec) {
+            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
+            return -1;
+        }
+
+        int new_id = m_next_id++;
+        connection_metadata::ptr metadata_ptr(new connection_metadata(new_id, con->get_handle(), uri));
+        m_connection_list[new_id] = metadata_ptr;
+
+        con->set_open_handler(websocketpp::lib::bind(
+            &connection_metadata::on_open,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+        con->set_fail_handler(websocketpp::lib::bind(
+            &connection_metadata::on_fail,
+            metadata_ptr,
+            &m_endpoint,
+            websocketpp::lib::placeholders::_1
+        ));
+
+        m_endpoint.connect(con);
+
+        return new_id;
+    }
+
+    connection_metadata::ptr get_metadata(int id) const {
+        con_list::const_iterator metadata_it = m_connection_list.find(id);
+        if (metadata_it == m_connection_list.end()) {
+            return connection_metadata::ptr();
+        } else {
+            return metadata_it->second;
+        }
+    }
+private:
+    typedef std::map<int,connection_metadata::ptr> con_list;
+
+    client m_endpoint;
+    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
+
+    con_list m_connection_list;
+    int m_next_id;
+};
+
+int main() {
+    bool done = false;
+    std::string input;
+    websocket_endpoint endpoint;
+
+    while (!done) {
+        std::cout << "Enter Command: ";
+        std::getline(std::cin, input);
+
+        if (input == "quit") {
+            done = true;
+        } else if (input == "help") {
+            std::cout
+                << "\nCommand List:\n"
+                << "connect <ws uri>\n"
+                << "show <connection id>\n"
+                << "help: Display this help text\n"
+                << "quit: Exit the program\n"
+                << std::endl;
+        } else if (input.substr(0,7) == "connect") {
+            int id = endpoint.connect(input.substr(8));
+            if (id != -1) {
+                std::cout << "> Created connection with id " << id << std::endl;
+            }
+        } else if (input.substr(0,4) == "show") {
+            int id = atoi(input.substr(5).c_str());
+
+            connection_metadata::ptr metadata = endpoint.get_metadata(id);
+            if (metadata) {
+                std::cout << *metadata << std::endl;
+            } else {
+                std::cout << "> Unknown connection id " << id << std::endl;
+            }
+        } else {
+            std::cout << "> Unrecognized Command" << std::endl;
+        }
+    }
+
+    return 0;
+}
+~~~
+
+### Step 5
+
+_Closing connections_
+
+This step adds a command that allows you to close a WebSocket connection and adjusts the quit command so that it cleanly closes all outstanding connections before quitting.
+
+#### Getting connection close information out of WebSocket++
+
+> ##### Terminology: WebSocket close codes & reasons
+> The WebSocket close handshake involves an exchange of optional machine readable close codes and human readable reason strings. Each endpoint sends independent close details. The codes are short integers. The reasons are UTF8 text strings of at most 125 characters. More details about valid close code ranges and the meaning of each code can be found at https://tools.ietf.org/html/rfc6455#section-7.4
+
+The `websocketpp::close::status` namespace contains named constants for all of the IANA defined close codes. It also includes free functions to determine whether a value is reserved or invalid and to convert a code to a human readable text representation.
+
+During the close handler call WebSocket++ connections offer the following methods for accessing close handshake information:
+
+- `connection::get_remote_close_code()`: Get the close code as reported by the remote endpoint
+- `connection::get_remote_close_reason()`: Get the close reason as reported by the remote endpoint
+- `connection::get_local_close_code()`: Get the close code that this endpoint sent.
+- `connection::get_local_close_reason()`: Get the close reason that this endpoint sent.
+- `connection::get_ec()`: Get a more detailed/specific WebSocket++ `error_code` indicating what library error (if any) ultimately resulted in the connection closure.
+
+*Note:* there are some special close codes that will report a code that was not actually sent on the wire. For example 1005/"no close code" indicates that the endpoint omitted a close code entirely and 1006/"abnormal close" indicates that there was a problem that resulted in the connection closing without having performed a close handshake.
+
+#### Add close handler
+
+The `connection_metadata::on_close` method is added. This method retrieves the close code and reason from the closing handshake and stores it in the local error reason field.
+
+~~~{.cpp}
+void on_close(client * c, websocketpp::connection_hdl hdl) {
+    m_status = "Closed";
+    client::connection_ptr con = c->get_con_from_hdl(hdl);
+    std::stringstream s;
+    s << "close code: " << con->get_remote_close_code() << " (" 
+      << websocketpp::close::status::get_string(con->get_remote_close_code()) 
+      << "), close reason: " << con->get_remote_close_reason();
+    m_error_reason = s.str();
+}
+~~~
+
+Similarly to `on_open` and `on_fail`, `websocket_endpoint::connect` registers this close handler when a new connection is made.
+
+#### Add close method to `websocket_endpoint`
+
+This method starts by looking up the given connection ID in the connection list.  Next a close request is sent to the connection's handle with the specified WebSocket close code. This is done by calling `endpoint::close`. This is a thread safe method that is used to asynchronously dispatch a close signal to the connection with the given handle. When the operation is complete the connection's close handler will be triggered.
+
+~~~{.cpp}
+void close(int id, websocketpp::close::status::value code) {
+    websocketpp::lib::error_code ec;
+    
+    con_list::iterator metadata_it = m_connection_list.find(id);
+    if (metadata_it == m_connection_list.end()) {
+        std::cout << "> No connection found with id " << id << std::endl;
+        return;
+    }
+    
+    m_endpoint.close(metadata_it->second->get_hdl(), code, "", ec);
+    if (ec) {
+        std::cout << "> Error initiating close: " << ec.message() << std::endl;
+    }
+}
+~~~
+
+#### Add close option to the command loop and help message
+
+A close option is added to the command loop. It takes a connection ID and optionally a close code and a close reason. If no code is specified the default of 1000/Normal is used. If no reason is specified, none is sent. The `endpoint::close` method will do some error checking and abort the close request if you try and send an invalid code or a reason with invalid UTF8 formatting. Reason strings longer than 125 characters will be truncated.
+
+An entry is also added to the help system to describe how the new command may be used.
+
+~~~{.cpp}
+else if (input.substr(0,5) == "close") {
+    std::stringstream ss(input);
+    
+    std::string cmd;
+    int id;
+    int close_code = websocketpp::close::status::normal;
+    std::string reason;
+    
+    ss >> cmd >> id >> close_code;
+    std::getline(ss,reason);
+    
+    endpoint.close(id, close_code, reason);
+}
+~~~
+
+#### Close all outstanding connections in `websocket_endpoint` destructor
+
+Until now quitting the program left outstanding connections and the WebSocket++ network thread in a lurch. Now that we have a method of closing connections we can clean this up properly.
+
+The destructor for `websocket_endpoint` now stops perpetual mode (so the run thread exits after the last connection is closed) and iterates through the list of open connections and requests a clean close for each. Finally, the run thread is joined which causes the program to wait until those connection closes complete.
+
+~~~{.cpp}
+~websocket_endpoint() {
+    m_endpoint.stop_perpetual();
+    
+    for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
+        if (it->second->get_status() != "Open") {
+            // Only close open connections
+            continue;
+        }
+        
+        std::cout << "> Closing connection " << it->second->get_id() << std::endl;
+        
+        websocketpp::lib::error_code ec;
+        m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
+        if (ec) {
+            std::cout << "> Error closing connection " << it->second->get_id() << ": "  
+                      << ec.message() << std::endl;
+        }
+    }
+    
+    m_thread->join();
+}
+~~~
+
+#### Build
+
+There are no changes to the build instructions from step 4
+
+#### Run
+
+~~~
+Enter Command: connect ws://localhost:9002
+> Created connection with id 0
+Enter Command: close 0 1001 example message
+Enter Command: show 0
+> URI: ws://localhost:9002
+> Status: Closed
+> Remote Server: WebSocket++/0.4.0
+> Error/close reason: close code: 1001 (Going away), close reason:  example message
+Enter Command: connect ws://localhost:9002
+> Created connection with id 1
+Enter Command: close 1 1006
+> Error initiating close: Invalid close code used
+Enter Command: quit
+> Closing connection 1
+~~~
+
+### Step 6
+
+_Sending and receiving messages_
+
+This step adds a command to send a message on a given connection and updates the show command to print a transcript of all sent and received messages for that connection.
+
+> ##### Terminology: WebSocket message types (opcodes)
+> WebSocket messages have types indicated by their opcode. The protocol currently specifies two different opcodes for data messages, text and binary. Text messages represent UTF8 text and will be validated as such. Binary messages represent raw binary bytes and are passed through directly with no validation. 
+>
+> WebSocket++ provides the values `websocketpp::frame::opcode::text` and `websocketpp::frame::opcode::binary` that can be used to direct how outgoing messages should be sent and to check how incoming messages are formatted.
+
+#### Sending Messages
+
+Messages are sent using `endpoint::send`. This is a thread safe method that may be called from anywhere to queue a message for sending on the specified connection. There are three send overloads for use with different scenarios. 
+
+Each method takes a `connection_hdl` to indicate which connection to send the message on as well as a `frame::opcode::value` to indicate which opcode to label the message as. All overloads are also available with an exception free varient that fills in a a status/error code instead of throwing.
+
+The first overload, `connection_hdl hdl, std::string const & payload, frame::opcode::value op`, takes a `std::string`. The string contents are copied into an internal buffer and can be safely modified after calling send.
+
+The second overload, `connection_hdl hdl, void const * payload, size_t len, frame::opcode::value op`, takes a void * buffer and length. The buffer contents are copied and can be safely modified after calling send.
+
+The third overload, `connection_hdl hdl, message_ptr msg`, takes a WebSocket++ `message_ptr`. This overload allows a message to be constructed in place before the call to send. It also may allow a single message buffer to be sent multiple times, including to multiple connections, without copying. Whether or not this actually happens depends on other factors such as whether compression is enabled. The contents of the message buffer may not be safely modified after being sent.
+
+> ###### Terminology: Outgoing WebSocket message queueing & flow control
+> In many configurations, such as when the Asio based transport is in use, WebSocket++ is an asynchronous system. As such the `endpoint::send` method may return before any bytes are actually written to the outgoing socket. In cases where send is called multiple times in quick succession messages may be coalesced and sent in the same operation or even the same TCP packet. When this happens the message boundaries are preserved (each call to send will produce a separate message).
+>
+> In the case of applications that call send from inside a handler this means that no messages will be written to the socket until that handler returns. If you are planning to send many messages in this manor or need a message to be written on the wire before continuing you should look into using multiple threads or the built in timer/interrupt handler functionality.
+>
+> If the outgoing socket link is slow messages may build up in this queue. You can use `connection::get_buffered_amount` to query the current size of the written message queue to decide if you want to change your sending behavior.
+
+#### Add send method to `websocket_endpoint`
+
+Like the close method, send will start by looking up the given connection ID in the connection list.  Next a send request is sent to the connection's handle with the specified WebSocket message and the text opcode. Finally, we record the sent message with our connection metadata object so later our show connection command can print a list of messages sent.
+
+~~~{.cpp}
+void send(int id, std::string message) {
+    websocketpp::lib::error_code ec;
+    
+    con_list::iterator metadata_it = m_connection_list.find(id);
+    if (metadata_it == m_connection_list.end()) {
+        std::cout << "> No connection found with id " << id << std::endl;
+        return;
+    }
+    
+    m_endpoint.send(metadata_it->second->get_hdl(), message, websocketpp::frame::opcode::text, ec);
+    if (ec) {
+        std::cout << "> Error sending message: " << ec.message() << std::endl;
+        return;
+    }
+    
+    metadata_it->second->record_sent_message(message);
+}
+~~~
+
+#### Add send option to the command loop and help message
+
+A send option is added to the command loop. It takes a connection ID and a text message to send. An entry is also added to the help system to describe how the new command may be used.
+
+~~~{.cpp}
+else if (input.substr(0,4) == "send") {
+    std::stringstream ss(input);
+        
+        std::string cmd;
+        int id;
+        std::string message = "";
+        
+        ss >> cmd >> id;
+        std::getline(ss,message);
+        
+        endpoint.send(id, message);
+}
+~~~
+
+#### Add glue to `connection_metadata` for storing sent messages
+
+In order to store messages sent on this connection some code is added to `connection_metadata`. This includes a new data member `std::vector<std::string> m_messages` to keep track of all messages sent and received as well as a method for adding a sent message in that list:
+
+~~~{.cpp}
+void record_sent_message(std::string message) {
+    m_messages.push_back(">> " + message);
+}
+~~~
+
+Finally the connection metadata output operator is updated to also print a list of processed messages:
+
+~~~{.cpp}
+out << "> Messages Processed: (" << data.m_messages.size() << ") \n";
+
+std::vector<std::string>::const_iterator it;
+for (it = data.m_messages.begin(); it != data.m_messages.end(); ++it) {
+    out << *it << "\n";
+}
+~~~
+
+#### Receiving Messages
+
+Messages are received by registering a message handler. This handler will be called once per message received and its signature is `void on_message(websocketpp::connection_hdl hdl, endpoint::message_ptr msg)`. The `connection_hdl`, like the similar parameter from the other handlers is a handle for the connection that the message was received on. The `message_ptr` is a pointer to an object that can be queried for the message payload, opcode, and other metadata. Note that the message_ptr type, as well as its underlying message type, is dependent on how your endpoint is configured and may be different for different configs.
+
+#### Add a message handler to method to `connection_metadata`
+
+The message receiving behave that we are implementing will be to collect all messages sent and received and to print them in order when the show connection command is run. The sent messages are already being added to that list. Now we add a message handler that pushes received messages to the list as well. Text messages are pushed as-is. Binary messages are first converted to printable hexadecimal format.
+
+~~~{.cpp}
+void on_message(websocketpp::connection_hdl hdl, client::message_ptr msg) {
+    if (msg->get_opcode() == websocketpp::frame::opcode::text) {
+        m_messages.push_back(msg->get_payload());
+    } else {
+        m_messages.push_back(websocketpp::utility::to_hex(msg->get_payload()));
+    }
+}
+~~~
+
+In order to have this handler called when new messages are received we also register it with our connection. Note that unlike most other handlers, the message handler has two parameters and thus needs two placeholders.
+
+~~~{.cpp}
+con->set_message_handler(websocketpp::lib::bind(
+    &connection_metadata::on_message,
+    metadata_ptr,
+    websocketpp::lib::placeholders::_1,
+    websocketpp::lib::placeholders::_2
+));
+~~~
+
+#### Build
+
+There are no changes to the build instructions from step 5
+
+#### Run
+
+In this example run we are connecting to the WebSocket++ example echo_server. This server will repeat any message we send back to it. You can also try testing this with the echo server at `ws://echo.websocket.org` with similar results.
+
+~~~
+Enter Command: connect ws://localhost:9002
+> Created connection with id 0
+Enter Command: send 0 example message
+Enter Command: show 0
+> URI: ws://localhost:9002
+> Status: Open
+> Remote Server: WebSocket++/0.4.0
+> Error/close reason: N/A
+> Messages Processed: (2)
+>>  example message
+<<  example message
+~~~
+
+### Step 7
+
+_Using TLS / Secure WebSockets_
+
+- Change the includes
+- link to the new library dependencies
+- Switch the config
+- add the `tls_init_handler`
+- configure the SSL context for desired security level
+- mixing secure and non-secure connections in one application.
+
+Chapter 2: Intermediate Features
+--------------------------------
+
+### Step 8
+
+_Intermediate level features_
+
+- Subprotocol negotiation
+- Setting and reading custom headers
+- Ping and Pong
+- Proxies?
+- Setting user agent
+- Setting Origin
+- Timers and security
+- Close behavior
+- Send one message to all connections
+
+
+### Misc stuff not sure if it should be included here or elsewhere?
+
+core websocket++ control flow.
+A handshake, followed by a split into 2 independent control strands
+- Handshake
+-- use information specified before the call to endpoint::connect to construct a WebSocket handshake request.
+-- Pass the WebSocket handshake request to the transport policy. The transport policy determines how to get these bytes to the endpoint playing the server role. Depending on which transport policy your endpoint uses this method will be different.
+-- Receive a handshake response from the underlying transport. This is parsed and checked for conformance to RFC6455. If the validation fails, the fail handler is called. Otherwise the open handler is called.
+- At this point control splits into two separate strands. One that reads new bytes from the transport policy on the incoming channle, the other that accepts new messages from the local application for framing and writing to the outgoing transport channel.
+- Read strand
+-- Read and process new bytes from transport
+-- If the bytes contain at least one complete message dispatch each message by calling the appropriate handler. This is either the message handler for data messages, or ping/pong/close handlers for each respective control message. If no handler is registered for a particular message it is ignored.
+-- Ask the transport layer for more bytes
+- Write strand
+-- Wait for messages from the application
+-- Perform error checking on message input,
+-- Frame message per RFC6455
+-- Queue message for sending
+-- Pass all outstanding messages to the transport policy for output
+-- When there are no messages left to send, return to waiting
+
+Important observations
+Handlers run in line with library processing which has several implications applications should be aware of:
diff --git a/vendor/websocketpp/tutorials/utility_server/step1.cpp b/vendor/websocketpp/tutorials/utility_server/step1.cpp
new file mode 100644
index 0000000..c0e4643
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_server/step1.cpp
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility server tutorial.
+// Additional related material can be found in the tutorials/utility_server
+// directory of the WebSocket++ repository.
+
+// The ASIO_STANDALONE define is necessary to use the standalone version of Asio.
+// Remove if you are using Boost Asio.
+#define ASIO_STANDALONE
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+#include <functional>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+class utility_server {
+public:
+    utility_server() {
+         // Set logging settings
+        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
+        m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);
+
+        // Initialize Asio
+        m_endpoint.init_asio();
+    }
+
+    void run() {
+        // Listen on port 9002
+        m_endpoint.listen(9002);
+
+        // Queues a connection accept operation
+        m_endpoint.start_accept();
+
+        // Start the Asio io_service run loop
+        m_endpoint.run();
+    }
+private:
+    server m_endpoint;
+};
+
+int main() {
+    utility_server s;
+    s.run();
+    return 0;
+}
diff --git a/vendor/websocketpp/tutorials/utility_server/step2.cpp b/vendor/websocketpp/tutorials/utility_server/step2.cpp
new file mode 100644
index 0000000..a2815bb
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_server/step2.cpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// **NOTE:** This file is a snapshot of the WebSocket++ utility server tutorial.
+// Additional related material can be found in the tutorials/utility_server
+// directory of the WebSocket++ repository.
+
+// The ASIO_STANDALONE define is necessary to use the standalone version of Asio.
+// Remove if you are using Boost Asio.
+#define ASIO_STANDALONE
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+#include <functional>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+class utility_server {
+public:
+    utility_server() {
+         // Set logging settings
+        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
+        m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);
+
+        // Initialize Asio
+        m_endpoint.init_asio();
+
+        // Set the default message handler to the echo handler
+        m_endpoint.set_message_handler(std::bind(
+            &utility_server::echo_handler, this,
+            std::placeholders::_1, std::placeholders::_2
+        ));
+    }
+
+    void echo_handler(websocketpp::connection_hdl hdl, server::message_ptr msg) {
+        // write a new message
+        m_endpoint.send(hdl, msg->get_payload(), msg->get_opcode());
+    }
+
+    void run() {
+        // Listen on port 9002
+        m_endpoint.listen(9002);
+
+        // Queues a connection accept operation
+        m_endpoint.start_accept();
+
+        // Start the Asio io_service run loop
+        m_endpoint.run();
+    }
+private:
+    server m_endpoint;
+};
+
+int main() {
+    utility_server s;
+    s.run();
+    return 0;
+}
diff --git a/vendor/websocketpp/tutorials/utility_server/utility_server.md b/vendor/websocketpp/tutorials/utility_server/utility_server.md
new file mode 100644
index 0000000..1c7ee3f
--- /dev/null
+++ b/vendor/websocketpp/tutorials/utility_server/utility_server.md
@@ -0,0 +1,181 @@
+Utility Server Example Application Tutorial
+===========================================
+
+Introduction
+------------
+
+This tutorial provides a step by step discussion of building a basic WebSocket++ server. The final product of this tutorial is the utility_server example application from the example section. This server demonstrates the following features:
+
+- Use Asio Transport for networking
+- Accept multiple WebSocket connections at once
+- Read incoming messages and perform a few basic actions (echo, broadcast, telemetry, server commands) based on the path
+- Use validate handler to reject connections to invalid paths
+- Serve basic HTTP responses with the http handler
+- Gracefully exit the server
+- Encrypt connections with TLS
+
+This tutorial is current as of the 0.6.x version of the library.
+
+Chapter 1: Initial Setup & Basics
+---------------------------------
+
+### Step 1
+
+_Add WebSocket++ includes and set up a a server endpoint type._
+
+WebSocket++ includes two major object types. The endpoint and the connection. The
+endpoint creates and launches new connections and maintains default settings for
+those connections. Endpoints also manage any shared network resources.
+
+The connection stores information specific to each WebSocket session.
+
+> **Note:** Once a connection is launched, there is no link between the endpoint and the connection. All default settings are copied into the new connection by the endpoint. Changing default settings on an endpoint will only affect future connections.
+Connections do not maintain a link back to their associated endpoint. Endpoints do not maintain a list of outstanding connections. If your application needs to iterate over all connections it will need to maintain a list of them itself.
+
+WebSocket++ endpoints are built by combining an endpoint role with an endpoint config. There are two different types of endpoint roles, one each for the client and server roles in a WebSocket session. This is a server tutorial so we will use the server role `websocketpp::server` which is provided by the `<websocketpp/server.hpp>` header.
+
+> #### Terminology: Endpoint Config
+> WebSocket++ endpoints have a group of settings that may be configured at compile time via the `config` template parameter. A config is a struct that contains types and static constants that are used to produce an endpoint with specific properties. Depending on which config is being used the endpoint will have different methods available and may have additional third party dependencies.
+
+The endpoint role takes a template parameter called `config` that is used to configure the behavior of endpoint at compile time. For this example we are going to use a default config provided by the library called `asio`, provided by `<websocketpp/config/asio_no_tls.hpp>`. This is a server config that uses the Asio library to provide network transport and does not support TLS based security. Later on we will discuss how to introduce TLS based security into a WebSocket++ application, more about the other stock configs, and how to build your own custom configs.
+
+Combine a config with an endpoint role to produce a fully configured endpoint. This type will be used frequently so I would recommend a typedef here.
+
+`typedef websocketpp::server<websocketpp::config::asio> server`
+
+#### `utility_server` constructor
+
+This endpoint type will be the base of the utility_server object that will keep track of the state of the server. Within the `utility_server` constructor several things happen:
+
+First, we adjust the endpoint logging behavior to include all error logging channels and all access logging channels except the frame payload, which is particularly noisy and generally useful only for debugging. [TODO: link to more information about logging]
+
+~~~{.cpp}
+m_endpoint.set_error_channels(websocketpp::log::elevel::all);
+m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);
+~~~
+
+Next, we initialize the transport system underlying the endpoint. This method is specific to the Asio transport not WebSocket++ core. It will not be necessary or present in endpoints that use a non-asio config.
+
+> **Note:** This example uses an internal Asio `io_service` that is managed by the endpoint itself. This is a simple arrangement suitable for programs where WebSocket++ is the only code using Asio. If you have an existing program that already manages an `io_service` object or want to build a new program where WebSocket++ handlers share an io_service with other handlers you can pass the `io_service` you want WebSocket++ to register its handlers on to the `init_asio()` method and it will use it instead of generating and managing its own. [TODO: FAQ link instead?]
+
+~~~{.cpp}
+m_endpoint.init_asio();
+~~~
+
+#### `utility_server::run` method
+
+In addition to the constructor, we also add a run method that sets up the listening socket, begins accepting connections, starts the Asio io_service event loop.
+
+~~~{.cpp}
+// Listen on port 9002
+m_endpoint.listen(9002);
+
+// Queues a connection accept operation
+m_endpoint.start_accept();
+
+// Start the Asio io_service run loop
+m_endpoint.run();
+~~~
+
+The final line, `m_endpoint.run();`, will block until the endpoint is instructed to stop listening for new connections. While running it will listen for and process new connections as well as accept and process new data and control messages for existing connections. WebSocket++ uses Asio in an asyncronous mode where multiple connections can be similtaneously serviced efficiently within a single thread.
+
+#### Build
+Adding WebSocket++ has added a few dependencies to our program that must be addressed in the build system. Firstly, the WebSocket++ library headers need must be in the include search path of your build system. How exactly this is done depends on where you have the WebSocket++ headers installed what build system you are using.
+
+For the rest of this tutorial we are going to assume a C++11 build environment. WebSocket++ will work with pre-C++11 systems if your build system has access to a recent version of the Boost library headers.
+
+Finally, to use the Asio transport config we need to bring in the Asio library. There are two options here. If you have access to a C++11 build environment the standalone version from http://think-async.com is a good option. This header only library does not bring in any special dependencies and ensures you have the latest version of Asio. If you do not have a C++11 build environment or already have brought in the Boost libraries you can also use the version of Asio bundled with Boost.
+
+To use standalone Asio, make sure the Asio headers are in your include path and define ASIO_STANDALONE. To use Boost Asio, make sure the Boost headers are in your include path and that you are linking to the boost_system library.
+
+`c++ -std=c++11 step1.cpp` (Asio Standalone)
+OR
+`c++ -std=c++11 step1.cpp -lboost_system` (Boost Asio)
+
+#### Code so far
+```cpp
+// The ASIO_STANDALONE define is necessary to use the standalone version of Asio.
+// Remove if you are using Boost Asio.
+#define ASIO_STANDALONE
+
+#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/server.hpp>
+
+#include <functional>
+
+typedef websocketpp::server<websocketpp::config::asio> server;
+
+class utility_server {
+public:
+    utility_server() {
+         // Set logging settings
+        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
+        m_endpoint.set_access_channels(websocketpp::log::alevel::all ^ websocketpp::log::alevel::frame_payload);
+
+        // Initialize Asio
+        m_endpoint.init_asio();
+    }
+
+    void run() {
+        // Listen on port 9002
+        m_endpoint.listen(9002);
+
+        // Queues a connection accept operation
+        m_endpoint.start_accept();
+
+        // Start the Asio io_service run loop
+        m_endpoint.run();
+    }
+private:
+    server m_endpoint;
+};
+
+int main() {
+    utility_server s;
+    s.run();
+    return 0;
+}
+```
+
+### Step 2
+
+_Set up a message handler to echo all replies back to the original user_
+
+#### Setting a message handler
+
+> ###### Terminology: Registering handlers
+> WebSocket++ provides a number of execution points where you can register to have a handler run. Which of these points are available to your endpoint will depend on its config. TLS handlers will not exist on non-TLS endpoints for example. A complete list of handlers can be found at  http://www.zaphoyd.com/websocketpp/manual/reference/handler-list.
+>
+> Handlers can be registered at the endpoint level and at the connection level. Endpoint handlers are copied into new connections as they are created. Changing an endpoint handler will affect only future connections. Handlers registered at the connection level will be bound to that specific connection only.
+>
+> The signature of handler binding methods is the same for endpoints and connections. The format is: `set_*_handler(...)`. Where * is the name of the handler. For example, `set_open_handler(...)` will set the handler to be called when a new connection is open. `set_fail_handler(...)` will set the handler to be called when a connection fails to connect.
+>
+> All handlers take one argument, a callable type that can be converted to a `std::function` with the correct count and type of arguments. You can pass free functions, functors, and Lambdas with matching argument lists as handlers. In addition, you can use `std::bind` (or `boost::bind`) to register functions with non-matching argument lists. This is useful for passing additional parameters not present in the handler signature or member functions that need to carry a 'this' pointer.
+>
+> The function signature of each handler can be looked up in the list above in the manual. In general, all handlers include the `connection_hdl` identifying which connection this even is associated with as the first parameter. Some handlers (such as the message handler) include additional parameters. Most handlers have a void return value but some (`validate`, `ping`, `tls_init`) do not. The specific meanings of the return values are documented in the handler list linked above.
+
+
+### Step 3
+
+_error handling_
+
+
+### Step 4
+
+_Set up open and close handlers and a connection data structure_
+
+### Step 5
+
+_Change the message handler for connections based on URI and add a validate handler to reject invalid URIs_
+
+### Step 6
+
+_Add some Admin commands (report total clients, cleanly shut down server)_
+
+### Step 7
+
+_Add some Broadcast commands_
+
+### Step 8
+
+_Add TLS_
diff --git a/vendor/websocketpp/websocketpp-config.cmake.in b/vendor/websocketpp/websocketpp-config.cmake.in
new file mode 100644
index 0000000..6afe569
--- /dev/null
+++ b/vendor/websocketpp/websocketpp-config.cmake.in
@@ -0,0 +1,7 @@
+# - Config file for the websocketpp package
+# It defines the following variables
+#  WEBSOCKETPP_FOUND - indicates that the module was found
+#  WEBSOCKETPP_INCLUDE_DIR - include directories
+
+set(WEBSOCKETPP_FOUND TRUE)
+set(WEBSOCKETPP_INCLUDE_DIR "@INSTALL_INCLUDE_DIR@")
diff --git a/vendor/websocketpp/websocketpp-configVersion.cmake.in b/vendor/websocketpp/websocketpp-configVersion.cmake.in
new file mode 100644
index 0000000..21f6865
--- /dev/null
+++ b/vendor/websocketpp/websocketpp-configVersion.cmake.in
@@ -0,0 +1,11 @@
+set(PACKAGE_VERSION "@WEBSOCKETPP_VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+  set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else()
+  set(PACKAGE_VERSION_COMPATIBLE TRUE)
+  if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+    set(PACKAGE_VERSION_EXACT TRUE)
+  endif()
+endif()
diff --git a/vendor/websocketpp/websocketpp/CMakeLists.txt b/vendor/websocketpp/websocketpp/CMakeLists.txt
new file mode 100644
index 0000000..3ea8cc1
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/CMakeLists.txt
@@ -0,0 +1,2 @@
+init_target("websocketpp")
+final_target ()
diff --git a/vendor/websocketpp/websocketpp/base64/base64.hpp b/vendor/websocketpp/websocketpp/base64/base64.hpp
new file mode 100644
index 0000000..ff1561d
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/base64/base64.hpp
@@ -0,0 +1,178 @@
+/*
+    ******
+    base64.hpp is a repackaging of the base64.cpp and base64.h files into a
+    single header suitable for use as a header only library. This conversion was
+    done by Peter Thorson (webmaster@zaphoyd.com) in 2012. All modifications to
+    the code are redistributed under the same license as the original, which is
+    listed below.
+    ******
+
+   base64.cpp and base64.h
+
+   Copyright (C) 2004-2008 René Nyffenegger
+
+   This source code is provided 'as-is', without any express or implied
+   warranty. In no event will the author be held liable for any damages
+   arising from the use of this software.
+
+   Permission is granted to anyone to use this software for any purpose,
+   including commercial applications, and to alter it and redistribute it
+   freely, subject to the following restrictions:
+
+   1. The origin of this source code must not be misrepresented; you must not
+      claim that you wrote the original source code. If you use this source code
+      in a product, an acknowledgment in the product documentation would be
+      appreciated but is not required.
+
+   2. Altered source versions must be plainly marked as such, and must not be
+      misrepresented as being the original source code.
+
+   3. This notice may not be removed or altered from any source distribution.
+
+   René Nyffenegger rene.nyffenegger@adp-gmbh.ch
+
+*/
+
+#ifndef _BASE64_HPP_
+#define _BASE64_HPP_
+
+#include <string>
+
+namespace websocketpp {
+
+static std::string const base64_chars =
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+             "abcdefghijklmnopqrstuvwxyz"
+             "0123456789+/";
+
+/// Test whether a character is a valid base64 character
+/**
+ * @param c The character to test
+ * @return true if c is a valid base64 character
+ */
+static inline bool is_base64(unsigned char c) {
+    return (c == 43 || // +
+           (c >= 47 && c <= 57) || // /-9
+           (c >= 65 && c <= 90) || // A-Z
+           (c >= 97 && c <= 122)); // a-z
+}
+
+/// Encode a char buffer into a base64 string
+/**
+ * @param input The input data
+ * @param len The length of input in bytes
+ * @return A base64 encoded string representing input
+ */
+inline std::string base64_encode(unsigned char const * input, size_t len) {
+    std::string ret;
+    int i = 0;
+    int j = 0;
+    unsigned char char_array_3[3];
+    unsigned char char_array_4[4];
+
+    while (len--) {
+        char_array_3[i++] = *(input++);
+        if (i == 3) {
+            char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+            char_array_4[1] = ((char_array_3[0] & 0x03) << 4) +
+                              ((char_array_3[1] & 0xf0) >> 4);
+            char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) +
+                              ((char_array_3[2] & 0xc0) >> 6);
+            char_array_4[3] = char_array_3[2] & 0x3f;
+
+            for(i = 0; (i <4) ; i++) {
+                ret += base64_chars[char_array_4[i]];
+            }
+            i = 0;
+        }
+    }
+
+    if (i) {
+        for(j = i; j < 3; j++) {
+            char_array_3[j] = '\0';
+        }
+
+        char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
+        char_array_4[1] = ((char_array_3[0] & 0x03) << 4) +
+                          ((char_array_3[1] & 0xf0) >> 4);
+        char_array_4[2] = ((char_array_3[1] & 0x0f) << 2) +
+                          ((char_array_3[2] & 0xc0) >> 6);
+        char_array_4[3] = char_array_3[2] & 0x3f;
+
+        for (j = 0; (j < i + 1); j++) {
+            ret += base64_chars[char_array_4[j]];
+        }
+
+        while((i++ < 3)) {
+            ret += '=';
+        }
+    }
+
+    return ret;
+}
+
+/// Encode a string into a base64 string
+/**
+ * @param input The input data
+ * @return A base64 encoded string representing input
+ */
+inline std::string base64_encode(std::string const & input) {
+    return base64_encode(
+        reinterpret_cast<const unsigned char *>(input.data()),
+        input.size()
+    );
+}
+
+/// Decode a base64 encoded string into a string of raw bytes
+/**
+ * @param input The base64 encoded input data
+ * @return A string representing the decoded raw bytes
+ */
+inline std::string base64_decode(std::string const & input) {
+    size_t in_len = input.size();
+    int i = 0;
+    int j = 0;
+    int in_ = 0;
+    unsigned char char_array_4[4], char_array_3[3];
+    std::string ret;
+
+    while (in_len-- && ( input[in_] != '=') && is_base64(input[in_])) {
+        char_array_4[i++] = input[in_]; in_++;
+        if (i ==4) {
+            for (i = 0; i <4; i++) {
+                char_array_4[i] = static_cast<unsigned char>(base64_chars.find(char_array_4[i]));
+            }
+
+            char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+            char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+            char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+            for (i = 0; (i < 3); i++) {
+                ret += char_array_3[i];
+            }
+            i = 0;
+        }
+    }
+
+    if (i) {
+        for (j = i; j <4; j++)
+            char_array_4[j] = 0;
+
+        for (j = 0; j <4; j++)
+            char_array_4[j] = static_cast<unsigned char>(base64_chars.find(char_array_4[j]));
+
+        char_array_3[0] = (char_array_4[0] << 2) + ((char_array_4[1] & 0x30) >> 4);
+        char_array_3[1] = ((char_array_4[1] & 0xf) << 4) + ((char_array_4[2] & 0x3c) >> 2);
+        char_array_3[2] = ((char_array_4[2] & 0x3) << 6) + char_array_4[3];
+
+        for (j = 0; (j < i - 1); j++) {
+            ret += static_cast<std::string::value_type>(char_array_3[j]);
+        }
+    }
+
+    return ret;
+}
+
+} // namespace websocketpp
+
+#endif // _BASE64_HPP_
diff --git a/vendor/websocketpp/websocketpp/client.hpp b/vendor/websocketpp/websocketpp/client.hpp
new file mode 100644
index 0000000..8782d7e
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/client.hpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CLIENT_HPP
+#define WEBSOCKETPP_CLIENT_HPP
+
+#include <websocketpp/roles/client_endpoint.hpp>
+
+#endif //WEBSOCKETPP_CLIENT_HPP
diff --git a/vendor/websocketpp/websocketpp/close.hpp b/vendor/websocketpp/websocketpp/close.hpp
new file mode 100644
index 0000000..ded7765
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/close.hpp
@@ -0,0 +1,342 @@
+
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CLOSE_HPP
+#define WEBSOCKETPP_CLOSE_HPP
+
+/** \file
+ * A package of types and methods for manipulating WebSocket close codes.
+ */
+
+#include <websocketpp/error.hpp>
+#include <websocketpp/common/network.hpp>
+#include <websocketpp/common/stdint.hpp>
+#include <websocketpp/utf8_validator.hpp>
+
+#include <string>
+
+namespace websocketpp {
+/// A package of types and methods for manipulating WebSocket close codes.
+namespace close {
+/// A package of types and methods for manipulating WebSocket close status'
+namespace status {
+    /// The type of a close code value.
+    typedef uint16_t value;
+
+    /// A blank value for internal use.
+    static value const blank = 0;
+
+    /// Close the connection without a WebSocket close handshake.
+    /**
+     * This special value requests that the WebSocket connection be closed
+     * without performing the WebSocket closing handshake. This does not comply
+     * with RFC6455, but should be safe to do if necessary. This could be useful
+     * for clients that need to disconnect quickly and cannot afford the
+     * complete handshake.
+     */
+    static value const omit_handshake = 1;
+
+    /// Close the connection with a forced TCP drop.
+    /**
+     * This special value requests that the WebSocket connection be closed by
+     * forcibly dropping the TCP connection. This will leave the other side of
+     * the connection with a broken connection and some expensive timeouts. this
+     * should not be done except in extreme cases or in cases of malicious
+     * remote endpoints.
+     */
+    static value const force_tcp_drop = 2;
+
+    /// Normal closure, meaning that the purpose for which the connection was
+    /// established has been fulfilled.
+    static value const normal = 1000;
+
+    /// The endpoint was "going away", such as a server going down or a browser
+    /// navigating away from a page.
+    static value const going_away = 1001;
+
+    /// A protocol error occurred.
+    static value const protocol_error = 1002;
+
+    /// The connection was terminated because an endpoint received a type of
+    /// data it cannot accept.
+    /**
+     * (e.g., an endpoint that understands only text data MAY send this if it
+     * receives a binary message).
+     */
+    static value const unsupported_data = 1003;
+
+    /// A dummy value to indicate that no status code was received.
+    /**
+     * This value is illegal on the wire.
+     */
+    static value const no_status = 1005;
+
+    /// A dummy value to indicate that the connection was closed abnormally.
+    /**
+     * In such a case there was no close frame to extract a value from. This
+     * value is illegal on the wire.
+     */
+    static value const abnormal_close = 1006;
+
+    /// An endpoint received message data inconsistent with its type.
+    /**
+     * For example: Invalid UTF8 bytes in a text message.
+     */
+    static value const invalid_payload = 1007;
+
+    /// An endpoint received a message that violated its policy.
+    /**
+     * This is a generic status code that can be returned when there is no other
+     * more suitable status code (e.g., 1003 or 1009) or if there is a need to
+     * hide specific details about the policy.
+     */
+    static value const policy_violation = 1008;
+
+    /// An endpoint received a message too large to process.
+    static value const message_too_big = 1009;
+
+    /// A client expected the server to accept a required extension request
+    /**
+     * The list of extensions that are needed SHOULD appear in the /reason/ part
+     * of the Close frame. Note that this status code is not used by the server,
+     * because it can fail the WebSocket handshake instead.
+     */
+    static value const extension_required = 1010;
+
+    /// An endpoint encountered an unexpected condition that prevented it from
+    /// fulfilling the request.
+    static value const internal_endpoint_error = 1011;
+
+    /// Indicates that the service is restarted. A client may reconnect and if
+    /// if it chooses to do so, should reconnect using a randomized delay of
+    /// 5-30s
+    static value const service_restart = 1012;
+
+    /// Indicates that the service is experiencing overload. A client should
+    /// only connect to a different IP (when there are multiple for the target)
+    /// or reconnect to the same IP upon user action.
+    static value const try_again_later = 1013;
+
+    /// An endpoint failed to perform a TLS handshake
+    /**
+     * Designated for use in applications expecting a status code to indicate
+     * that the connection was closed due to a failure to perform a TLS
+     * handshake (e.g., the server certificate can't be verified). This value is
+     * illegal on the wire.
+     */
+    static value const tls_handshake = 1015;
+    
+    /// A generic subprotocol error
+    /**
+     * Indicates that a subprotocol error occurred. Typically this involves
+     * receiving a message that is not formatted as a valid message for the
+     * subprotocol in use.
+     */
+    static value const subprotocol_error = 3000;
+    
+    /// A invalid subprotocol data
+    /**
+     * Indicates that data was received that violated the specification of the
+     * subprotocol in use.
+     */
+    static value const invalid_subprotocol_data = 3001;
+
+    /// First value in range reserved for future protocol use
+    static value const rsv_start = 1016;
+    /// Last value in range reserved for future protocol use
+    static value const rsv_end = 2999;
+
+    /// Test whether a close code is in a reserved range
+    /**
+     * @param [in] code The code to test
+     * @return Whether or not code is reserved
+     */
+    inline bool reserved(value code) {
+        return ((code >= rsv_start && code <= rsv_end) ||
+                code == 1004 || code == 1014);
+    }
+
+    /// First value in range that is always invalid on the wire
+    static value const invalid_low = 999;
+    /// Last value in range that is always invalid on the wire
+    static value const invalid_high = 5000;
+
+    /// Test whether a close code is invalid on the wire
+    /**
+     * @param [in] code The code to test
+     * @return Whether or not code is invalid on the wire
+     */
+    inline bool invalid(value code) {
+        return (code <= invalid_low || code >= invalid_high ||
+                code == no_status || code == abnormal_close ||
+                code == tls_handshake);
+    }
+
+    /// Determine if the code represents an unrecoverable error
+    /**
+     * There is a class of errors for which once they are discovered normal
+     * WebSocket functionality can no longer occur. This function determines
+     * if a given code is one of these values. This information is used to
+     * determine if the system has the capability of waiting for a close
+     * acknowledgement or if it should drop the TCP connection immediately
+     * after sending its close frame.
+     *
+     * @param [in] code The value to test.
+     * @return True if the code represents an unrecoverable error
+     */
+    inline bool terminal(value code) {
+        return (code == protocol_error || code == invalid_payload ||
+                code == policy_violation || code == message_too_big ||
+                 code == internal_endpoint_error);
+    }
+    
+    /// Return a human readable interpretation of a WebSocket close code
+    /**
+     * See https://tools.ietf.org/html/rfc6455#section-7.4 for more details.
+     *
+     * @since 0.3.0
+     *
+     * @param [in] code The code to look up.
+     * @return A human readable interpretation of the code.
+     */
+    inline std::string get_string(value code) {
+        switch (code) {
+            case normal:
+                return "Normal close";
+            case going_away:
+                return "Going away";
+            case protocol_error:
+                return "Protocol error";
+            case unsupported_data:
+                return "Unsupported data";
+            case no_status:
+                return "No status set";
+            case abnormal_close:
+                return "Abnormal close";
+            case invalid_payload:
+                return "Invalid payload";
+            case policy_violation:
+                return "Policy violoation";
+            case message_too_big:
+                return "Message too big";
+            case extension_required:
+                return "Extension required";
+            case internal_endpoint_error:
+                return "Internal endpoint error";
+            case tls_handshake:
+                return "TLS handshake failure";
+            case subprotocol_error:
+                return "Generic subprotocol error";
+            case invalid_subprotocol_data:
+                return "Invalid subprotocol data";
+            default:
+                return "Unknown";
+        }
+    }
+} // namespace status
+
+/// Type used to convert close statuses between integer and wire representations
+union code_converter {
+    uint16_t i;
+    char c[2];
+};
+
+/// Extract a close code value from a close payload
+/**
+ * If there is no close value (ie string is empty) status::no_status is
+ * returned. If a code couldn't be extracted (usually do to a short or
+ * otherwise mangled payload) status::protocol_error is returned and the ec
+ * value is flagged as an error. Note that this case is different than the case
+ * where protocol error is received over the wire.
+ *
+ * If the value is in an invalid or reserved range ec is set accordingly.
+ *
+ * @param [in] payload Close frame payload value received over the wire.
+ * @param [out] ec Set to indicate what error occurred, if any.
+ * @return The extracted value
+ */
+inline status::value extract_code(std::string const & payload, lib::error_code
+    & ec)
+{
+    ec = lib::error_code();
+
+    if (payload.size() == 0) {
+        return status::no_status;
+    } else if (payload.size() == 1) {
+        ec = make_error_code(error::bad_close_code);
+        return status::protocol_error;
+    }
+
+    code_converter val;
+
+    val.c[0] = payload[0];
+    val.c[1] = payload[1];
+
+    status::value code(ntohs(val.i));
+
+    if (status::invalid(code)) {
+        ec = make_error_code(error::invalid_close_code);
+    }
+
+    if (status::reserved(code)) {
+        ec = make_error_code(error::reserved_close_code);
+    }
+
+    return code;
+}
+
+/// Extract the reason string from a close payload
+/**
+ * The string should be a valid UTF8 message. error::invalid_utf8 will be set if
+ * the function extracts a reason that is not valid UTF8.
+ *
+ * @param [in] payload The payload string to extract a reason from.
+ * @param [out] ec Set to indicate what error occurred, if any.
+ * @return The reason string.
+ */
+inline std::string extract_reason(std::string const & payload, lib::error_code
+    & ec)
+{
+    std::string reason;
+    ec = lib::error_code();
+
+    if (payload.size() > 2) {
+        reason.append(payload.begin()+2,payload.end());
+    }
+
+    if (!websocketpp::utf8_validator::validate(reason)) {
+        ec = make_error_code(error::invalid_utf8);
+    }
+
+    return reason;
+}
+
+} // namespace close
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CLOSE_HPP
diff --git a/vendor/websocketpp/websocketpp/common/asio.hpp b/vendor/websocketpp/websocketpp/common/asio.hpp
new file mode 100644
index 0000000..ca48359
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/asio.hpp
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_ASIO_HPP
+#define WEBSOCKETPP_COMMON_ASIO_HPP
+
+// This file goes to some length to preserve compatibility with versions of 
+// boost older than 1.49 (where the first modern steady_timer timer based on 
+// boost/std chrono was introduced.
+//
+// For the versions older than 1.49, the deadline_timer is used instead. this
+// brings in dependencies on boost date_time and it has a different interface
+// that is normalized by the `lib::asio::is_neg` and `lib::asio::milliseconds`
+// wrappers provided by this file.
+//
+// The primary reason for this continued support is that boost 1.48 is the
+// default and not easily changeable version of boost supplied by the package
+// manager of popular Linux distributions like Ubuntu 12.04 LTS. Once the need
+// for this has passed this should be cleaned up and simplified.
+
+#ifdef ASIO_STANDALONE
+    #include <asio/version.hpp>
+    
+    #if (ASIO_VERSION/100000) == 1 && ((ASIO_VERSION/100)%1000) < 8
+        static_assert(false, "The minimum version of standalone Asio is 1.8.0");
+    #endif
+    
+    #include <asio.hpp>
+    #include <asio/steady_timer.hpp>
+    #include <websocketpp/common/chrono.hpp> 
+#else
+    #include <boost/version.hpp>
+    
+    // See note above about boost <1.49 compatibility. If we are running on 
+    // boost > 1.48 pull in the steady timer and chrono library
+    #if (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) > 48
+        #include <boost/asio/steady_timer.hpp>
+        #include <websocketpp/common/chrono.hpp>
+    #endif
+    
+    #include <boost/asio.hpp>
+    #include <boost/system/error_code.hpp>
+#endif
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef ASIO_STANDALONE
+    namespace asio {
+        using namespace ::asio;
+        // Here we assume that we will be using std::error_code with standalone
+        // Asio. This is probably a good assumption, but it is possible in rare
+        // cases that local Asio versions would be used.
+        using std::errc;
+        
+        // See note above about boost <1.49 compatibility. Because we require
+        // a standalone Asio version of 1.8+ we are guaranteed to have 
+        // steady_timer available. By convention we require the chrono library
+        // (either boost or std) for use with standalone Asio.
+        template <typename T>
+        bool is_neg(T duration) {
+            return duration.count() < 0;
+        }
+        inline lib::chrono::milliseconds milliseconds(long duration) {
+            return lib::chrono::milliseconds(duration);
+        }
+    } // namespace asio
+    
+#else
+    namespace asio {
+        using namespace boost::asio;
+        
+        // See note above about boost <1.49 compatibility
+        #if (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) > 48
+            // Using boost::asio >=1.49 so we use chrono and steady_timer
+            template <typename T>
+            bool is_neg(T duration) {
+                return duration.count() < 0;
+            }
+            inline lib::chrono::milliseconds milliseconds(long duration) {
+                return lib::chrono::milliseconds(duration);
+            }
+        #else
+            // Using boost::asio <1.49 we pretend a deadline timer is a steady
+            // timer and wrap the negative detection and duration conversion
+            // appropriately.
+            typedef boost::asio::deadline_timer steady_timer;
+            
+            template <typename T>
+            bool is_neg(T duration) {
+                return duration.is_negative();
+            }
+            inline boost::posix_time::time_duration milliseconds(long duration) {
+                return boost::posix_time::milliseconds(duration);
+            }
+        #endif
+        
+        using boost::system::error_code;
+        namespace errc = boost::system::errc;
+    } // namespace asio
+#endif
+
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_ASIO_HPP
diff --git a/vendor/websocketpp/websocketpp/common/asio_ssl.hpp b/vendor/websocketpp/websocketpp/common/asio_ssl.hpp
new file mode 100644
index 0000000..6989283
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/asio_ssl.hpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_ASIO_SSL_HPP
+#define WEBSOCKETPP_COMMON_ASIO_SSL_HPP
+
+// NOTE: This file must be included before common/asio.hpp
+
+#ifdef ASIO_STANDALONE
+    #include <asio/ssl.hpp>
+#else
+    #include <boost/asio/ssl.hpp>
+#endif
+
+#endif // WEBSOCKETPP_COMMON_ASIO_SSL_HPP
diff --git a/vendor/websocketpp/websocketpp/common/chrono.hpp b/vendor/websocketpp/websocketpp/common/chrono.hpp
new file mode 100644
index 0000000..975ee04
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/chrono.hpp
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_CHRONO_HPP
+#define WEBSOCKETPP_COMMON_CHRONO_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 functional header, then prefer it to
+// boost.
+#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_CHRONO_
+    #ifndef _WEBSOCKETPP_CPP11_CHRONO_
+        #define _WEBSOCKETPP_CPP11_CHRONO_
+    #endif
+#endif
+
+// If we're on Visual Studio 2012 or higher and haven't explicitly disabled
+// the use of C++11 chrono header then prefer it to boost.
+#if defined(_MSC_VER) && _MSC_VER >= 1700 && !defined _WEBSOCKETPP_NO_CPP11_CHRONO_
+    #ifndef _WEBSOCKETPP_CPP11_CHRONO_
+        #define _WEBSOCKETPP_CPP11_CHRONO_
+    #endif
+#endif
+
+#ifdef _WEBSOCKETPP_CPP11_CHRONO_
+    #include <chrono>
+#else
+    #include <boost/chrono.hpp>
+#endif
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef _WEBSOCKETPP_CPP11_CHRONO_
+    namespace chrono = std::chrono;
+#else
+    namespace chrono = boost::chrono;
+#endif
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_CHRONO_HPP
diff --git a/vendor/websocketpp/websocketpp/common/connection_hdl.hpp b/vendor/websocketpp/websocketpp/common/connection_hdl.hpp
new file mode 100644
index 0000000..1044c88
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/connection_hdl.hpp
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_CONNECTION_HDL_HPP
+#define WEBSOCKETPP_COMMON_CONNECTION_HDL_HPP
+
+#include <websocketpp/common/memory.hpp>
+
+namespace websocketpp {
+
+/// A handle to uniquely identify a connection.
+/**
+ * This type uniquely identifies a connection. It is implemented as a weak
+ * pointer to the connection in question. This provides uniqueness across
+ * multiple endpoints and ensures that IDs never conflict or run out.
+ *
+ * It is safe to make copies of this handle, store those copies in containers,
+ * and use them from other threads.
+ *
+ * This handle can be upgraded to a full shared_ptr using
+ * `endpoint::get_con_from_hdl()` from within a handler fired by the connection
+ * that owns the handler.
+ */
+typedef lib::weak_ptr<void> connection_hdl;
+
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_CONNECTION_HDL_HPP
diff --git a/vendor/websocketpp/websocketpp/common/cpp11.hpp b/vendor/websocketpp/websocketpp/common/cpp11.hpp
new file mode 100644
index 0000000..492a3b8
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/cpp11.hpp
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_CPP11_HPP
+#define WEBSOCKETPP_COMMON_CPP11_HPP
+
+/**
+ * This header sets up some constants based on the state of C++11 support
+ */
+
+// Hide clang feature detection from other compilers
+#ifndef __has_feature         // Optional of course.
+  #define __has_feature(x) 0  // Compatibility with non-clang compilers.
+#endif
+#ifndef __has_extension
+  #define __has_extension __has_feature // Compatibility with pre-3.0 compilers.
+#endif
+
+// The code below attempts to use information provided by the build system or
+// user supplied defines to selectively enable C++11 language and library
+// features. In most cases features that are targeted individually may also be
+// selectively disabled via an associated _WEBSOCKETPP_NOXXX_ define.
+
+#if defined(_WEBSOCKETPP_CPP11_STL_) || __cplusplus >= 201103L || defined(_WEBSOCKETPP_CPP11_STRICT_)
+    // This check tests for blanket c++11 coverage. It can be activated in one
+    // of three ways. Either the compiler itself reports that it is a full 
+    // C++11 compiler via the __cplusplus macro or the user/build system
+    // supplies one of the two preprocessor defines below:
+    
+    // This is defined to allow other WebSocket++ common headers to enable
+    // C++11 features when they are detected by this file rather than
+    // duplicating the above logic in every common header.
+    #define _WEBSOCKETPP_CPP11_INTERNAL_
+    
+    // _WEBSOCKETPP_CPP11_STRICT_
+    //
+    // This define reports to WebSocket++ that 100% of the language and library
+    // features of C++11 are available. Using this define on a non-C++11
+    // compiler will result in problems.
+    
+    // _WEBSOCKETPP_CPP11_STL_ 
+    //
+    // This define enables *most* C++11 options that were implemented early on
+    // by compilers. It is typically used for compilers that have many, but not
+    // all C++11 features. It should be safe to use on GCC 4.7-4.8 and perhaps
+    // earlier. 
+    #ifndef _WEBSOCKETPP_NOEXCEPT_TOKEN_
+        #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
+    #endif
+    #ifndef _WEBSOCKETPP_CONSTEXPR_TOKEN_
+        #define _WEBSOCKETPP_CONSTEXPR_TOKEN_ constexpr
+    #endif
+    #ifndef _WEBSOCKETPP_INITIALIZER_LISTS_
+        #define _WEBSOCKETPP_INITIALIZER_LISTS_
+    #endif
+    #ifndef _WEBSOCKETPP_NULLPTR_TOKEN_
+        #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
+    #endif
+    #ifndef _WEBSOCKETPP_MOVE_SEMANTICS_
+        #define _WEBSOCKETPP_MOVE_SEMANTICS_
+    #endif
+    #ifndef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+        #define _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+    #endif
+    
+    #ifndef __GNUC__
+        // GCC as of version 4.9 (latest) does not support std::put_time yet.
+        // so ignore it
+        #define _WEBSOCKETPP_PUTTIME_
+    #endif
+#else
+    // In the absence of a blanket define, try to use compiler versions or
+    // feature testing macros to selectively enable what we can.
+
+    // Test for noexcept
+    #ifndef _WEBSOCKETPP_NOEXCEPT_TOKEN_
+        #ifdef _WEBSOCKETPP_NOEXCEPT_
+            // build system says we have noexcept
+            #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
+        #else
+            #if __has_feature(cxx_noexcept)
+                // clang feature detect says we have noexcept
+                #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
+            #elif defined(_MSC_VER) && _MSC_VER >= 1900
+            	// Visual Studio 2015+ has noexcept
+                #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
+            #else
+                // assume we don't have noexcept
+                #define _WEBSOCKETPP_NOEXCEPT_TOKEN_
+            #endif
+        #endif
+    #endif
+
+    // Test for constexpr
+    #ifndef _WEBSOCKETPP_CONSTEXPR_TOKEN_
+        #ifdef _WEBSOCKETPP_CONSTEXPR_
+            // build system says we have constexpr
+            #define _WEBSOCKETPP_CONSTEXPR_TOKEN_ constexpr
+        #else
+            #if __has_feature(cxx_constexpr)
+                // clang feature detect says we have constexpr
+                #define _WEBSOCKETPP_CONSTEXPR_TOKEN_ constexpr
+            #elif defined(_MSC_VER) && _MSC_VER >= 1900
+            	// Visual Studio 2015+ has constexpr
+                #define _WEBSOCKETPP_CONSTEXPR_TOKEN_ constexpr
+            #else
+                // assume we don't have constexpr
+                #define _WEBSOCKETPP_CONSTEXPR_TOKEN_
+            #endif
+        #endif
+    #endif
+
+    // Enable initializer lists on clang when available.
+    #if __has_feature(cxx_generalized_initializers) && !defined(_WEBSOCKETPP_INITIALIZER_LISTS_)
+        #define _WEBSOCKETPP_INITIALIZER_LISTS_
+    #endif
+    
+    // Test for nullptr
+    #ifndef _WEBSOCKETPP_NULLPTR_TOKEN_
+        #ifdef _WEBSOCKETPP_NULLPTR_
+            // build system says we have nullptr
+            #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
+        #else
+            #if __has_feature(cxx_nullptr)
+                // clang feature detect says we have nullptr
+                #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
+            #elif defined(_MSC_VER) &&_MSC_VER >= 1600
+                // Visual Studio version that has nullptr
+                #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
+            #else
+                // assume we don't have nullptr
+                #define _WEBSOCKETPP_NULLPTR_TOKEN_ 0
+            #endif
+        #endif
+    #endif
+#endif
+
+#endif // WEBSOCKETPP_COMMON_CPP11_HPP
diff --git a/vendor/websocketpp/websocketpp/common/functional.hpp b/vendor/websocketpp/websocketpp/common/functional.hpp
new file mode 100644
index 0000000..d332dd1
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/functional.hpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_FUNCTIONAL_HPP
+#define WEBSOCKETPP_COMMON_FUNCTIONAL_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 functional header, then prefer it to
+// boost.
+#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_FUNCTIONAL_
+    #ifndef _WEBSOCKETPP_CPP11_FUNCTIONAL_
+        #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
+    #endif
+#endif
+
+// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
+// the use of C++11 functional header then prefer it to boost.
+#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_FUNCTIONAL_
+    #ifndef _WEBSOCKETPP_CPP11_FUNCTIONAL_
+        #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
+    #endif
+#endif
+
+
+
+#ifdef _WEBSOCKETPP_CPP11_FUNCTIONAL_
+    #include <functional>
+#else
+    #include <boost/bind.hpp>
+    #include <boost/function.hpp>
+    #include <boost/ref.hpp>
+#endif
+
+
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef _WEBSOCKETPP_CPP11_FUNCTIONAL_
+    using std::function;
+    using std::bind;
+    using std::ref;
+    namespace placeholders = std::placeholders;
+
+    // There are some cases where a C++11 compiler balks at using std::ref
+    // but a C++03 compiler using boost function requires boost::ref. As such
+    // lib::ref is not useful in these cases. Instead this macro allows the use
+    // of boost::ref in the case of a boost compile or no reference wrapper at
+    // all in the case of a C++11 compile
+    #define _WEBSOCKETPP_REF(x) x
+
+    template <typename T>
+    void clear_function(T & x) {
+        x = nullptr;
+    }
+#else
+    using boost::function;
+    using boost::bind;
+    using boost::ref;
+    namespace placeholders {
+        /// \todo this feels hacky, is there a better way?
+        using ::_1;
+        using ::_2;
+        using ::_3;
+    }
+
+    // See above definition for more details on what this is and why it exists
+    #define _WEBSOCKETPP_REF(x) boost::ref(x)
+
+    template <typename T>
+    void clear_function(T & x) {
+        x.clear();
+    }
+#endif
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_FUNCTIONAL_HPP
diff --git a/vendor/websocketpp/websocketpp/common/md5.hpp b/vendor/websocketpp/websocketpp/common/md5.hpp
new file mode 100644
index 0000000..279725f
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/md5.hpp
@@ -0,0 +1,448 @@
+/*
+  md5.hpp is a reformulation of the md5.h and md5.c code from
+  http://www.opensource.apple.com/source/cups/cups-59/cups/md5.c to allow it to
+  function as a component of a header only library. This conversion was done by
+  Peter Thorson (webmaster@zaphoyd.com) in 2012 for the WebSocket++ project. The
+  changes are released under the same license as the original (listed below)
+*/
+/*
+  Copyright (C) 1999, 2002 Aladdin Enterprises.  All rights reserved.
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  L. Peter Deutsch
+  ghost@aladdin.com
+
+ */
+/* $Id: md5.h,v 1.4 2002/04/13 19:20:28 lpd Exp $ */
+/*
+  Independent implementation of MD5 (RFC 1321).
+
+  This code implements the MD5 Algorithm defined in RFC 1321, whose
+  text is available at
+    http://www.ietf.org/rfc/rfc1321.txt
+  The code is derived from the text of the RFC, including the test suite
+  (section A.5) but excluding the rest of Appendix A.  It does not include
+  any code or documentation that is identified in the RFC as being
+  copyrighted.
+
+  The original and principal author of md5.h is L. Peter Deutsch
+  <ghost@aladdin.com>.  Other authors are noted in the change history
+  that follows (in reverse chronological order):
+
+  2002-04-13 lpd Removed support for non-ANSI compilers; removed
+    references to Ghostscript; clarified derivation from RFC 1321;
+    now handles byte order either statically or dynamically.
+  1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
+  1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
+    added conditionalization for C++ compilation from Martin
+    Purschke <purschke@bnl.gov>.
+  1999-05-03 lpd Original version.
+ */
+
+#ifndef WEBSOCKETPP_COMMON_MD5_HPP
+#define WEBSOCKETPP_COMMON_MD5_HPP
+
+/*
+ * This package supports both compile-time and run-time determination of CPU
+ * byte order.  If ARCH_IS_BIG_ENDIAN is defined as 0, the code will be
+ * compiled to run only on little-endian CPUs; if ARCH_IS_BIG_ENDIAN is
+ * defined as non-zero, the code will be compiled to run only on big-endian
+ * CPUs; if ARCH_IS_BIG_ENDIAN is not defined, the code will be compiled to
+ * run on either big- or little-endian CPUs, but will run slightly less
+ * efficiently on either one than if ARCH_IS_BIG_ENDIAN is defined.
+ */
+
+#include <stddef.h>
+#include <string>
+#include <cstring>
+
+namespace websocketpp {
+/// Provides MD5 hashing functionality
+namespace md5 {
+
+typedef unsigned char md5_byte_t; /* 8-bit byte */
+typedef unsigned int md5_word_t; /* 32-bit word */
+
+/* Define the state of the MD5 Algorithm. */
+typedef struct md5_state_s {
+    md5_word_t count[2];    /* message length in bits, lsw first */
+    md5_word_t abcd[4];     /* digest buffer */
+    md5_byte_t buf[64];     /* accumulate block */
+} md5_state_t;
+
+/* Initialize the algorithm. */
+inline void md5_init(md5_state_t *pms);
+
+/* Append a string to the message. */
+inline void md5_append(md5_state_t *pms, md5_byte_t const * data, size_t nbytes);
+
+/* Finish the message and return the digest. */
+inline void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
+
+#undef ZSW_MD5_BYTE_ORDER   /* 1 = big-endian, -1 = little-endian, 0 = unknown */
+#ifdef ARCH_IS_BIG_ENDIAN
+#  define ZSW_MD5_BYTE_ORDER (ARCH_IS_BIG_ENDIAN ? 1 : -1)
+#else
+#  define ZSW_MD5_BYTE_ORDER 0
+#endif
+
+#define ZSW_MD5_T_MASK ((md5_word_t)~0)
+#define ZSW_MD5_T1 /* 0xd76aa478 */ (ZSW_MD5_T_MASK ^ 0x28955b87)
+#define ZSW_MD5_T2 /* 0xe8c7b756 */ (ZSW_MD5_T_MASK ^ 0x173848a9)
+#define ZSW_MD5_T3    0x242070db
+#define ZSW_MD5_T4 /* 0xc1bdceee */ (ZSW_MD5_T_MASK ^ 0x3e423111)
+#define ZSW_MD5_T5 /* 0xf57c0faf */ (ZSW_MD5_T_MASK ^ 0x0a83f050)
+#define ZSW_MD5_T6    0x4787c62a
+#define ZSW_MD5_T7 /* 0xa8304613 */ (ZSW_MD5_T_MASK ^ 0x57cfb9ec)
+#define ZSW_MD5_T8 /* 0xfd469501 */ (ZSW_MD5_T_MASK ^ 0x02b96afe)
+#define ZSW_MD5_T9    0x698098d8
+#define ZSW_MD5_T10 /* 0x8b44f7af */ (ZSW_MD5_T_MASK ^ 0x74bb0850)
+#define ZSW_MD5_T11 /* 0xffff5bb1 */ (ZSW_MD5_T_MASK ^ 0x0000a44e)
+#define ZSW_MD5_T12 /* 0x895cd7be */ (ZSW_MD5_T_MASK ^ 0x76a32841)
+#define ZSW_MD5_T13    0x6b901122
+#define ZSW_MD5_T14 /* 0xfd987193 */ (ZSW_MD5_T_MASK ^ 0x02678e6c)
+#define ZSW_MD5_T15 /* 0xa679438e */ (ZSW_MD5_T_MASK ^ 0x5986bc71)
+#define ZSW_MD5_T16    0x49b40821
+#define ZSW_MD5_T17 /* 0xf61e2562 */ (ZSW_MD5_T_MASK ^ 0x09e1da9d)
+#define ZSW_MD5_T18 /* 0xc040b340 */ (ZSW_MD5_T_MASK ^ 0x3fbf4cbf)
+#define ZSW_MD5_T19    0x265e5a51
+#define ZSW_MD5_T20 /* 0xe9b6c7aa */ (ZSW_MD5_T_MASK ^ 0x16493855)
+#define ZSW_MD5_T21 /* 0xd62f105d */ (ZSW_MD5_T_MASK ^ 0x29d0efa2)
+#define ZSW_MD5_T22    0x02441453
+#define ZSW_MD5_T23 /* 0xd8a1e681 */ (ZSW_MD5_T_MASK ^ 0x275e197e)
+#define ZSW_MD5_T24 /* 0xe7d3fbc8 */ (ZSW_MD5_T_MASK ^ 0x182c0437)
+#define ZSW_MD5_T25    0x21e1cde6
+#define ZSW_MD5_T26 /* 0xc33707d6 */ (ZSW_MD5_T_MASK ^ 0x3cc8f829)
+#define ZSW_MD5_T27 /* 0xf4d50d87 */ (ZSW_MD5_T_MASK ^ 0x0b2af278)
+#define ZSW_MD5_T28    0x455a14ed
+#define ZSW_MD5_T29 /* 0xa9e3e905 */ (ZSW_MD5_T_MASK ^ 0x561c16fa)
+#define ZSW_MD5_T30 /* 0xfcefa3f8 */ (ZSW_MD5_T_MASK ^ 0x03105c07)
+#define ZSW_MD5_T31    0x676f02d9
+#define ZSW_MD5_T32 /* 0x8d2a4c8a */ (ZSW_MD5_T_MASK ^ 0x72d5b375)
+#define ZSW_MD5_T33 /* 0xfffa3942 */ (ZSW_MD5_T_MASK ^ 0x0005c6bd)
+#define ZSW_MD5_T34 /* 0x8771f681 */ (ZSW_MD5_T_MASK ^ 0x788e097e)
+#define ZSW_MD5_T35    0x6d9d6122
+#define ZSW_MD5_T36 /* 0xfde5380c */ (ZSW_MD5_T_MASK ^ 0x021ac7f3)
+#define ZSW_MD5_T37 /* 0xa4beea44 */ (ZSW_MD5_T_MASK ^ 0x5b4115bb)
+#define ZSW_MD5_T38    0x4bdecfa9
+#define ZSW_MD5_T39 /* 0xf6bb4b60 */ (ZSW_MD5_T_MASK ^ 0x0944b49f)
+#define ZSW_MD5_T40 /* 0xbebfbc70 */ (ZSW_MD5_T_MASK ^ 0x4140438f)
+#define ZSW_MD5_T41    0x289b7ec6
+#define ZSW_MD5_T42 /* 0xeaa127fa */ (ZSW_MD5_T_MASK ^ 0x155ed805)
+#define ZSW_MD5_T43 /* 0xd4ef3085 */ (ZSW_MD5_T_MASK ^ 0x2b10cf7a)
+#define ZSW_MD5_T44    0x04881d05
+#define ZSW_MD5_T45 /* 0xd9d4d039 */ (ZSW_MD5_T_MASK ^ 0x262b2fc6)
+#define ZSW_MD5_T46 /* 0xe6db99e5 */ (ZSW_MD5_T_MASK ^ 0x1924661a)
+#define ZSW_MD5_T47    0x1fa27cf8
+#define ZSW_MD5_T48 /* 0xc4ac5665 */ (ZSW_MD5_T_MASK ^ 0x3b53a99a)
+#define ZSW_MD5_T49 /* 0xf4292244 */ (ZSW_MD5_T_MASK ^ 0x0bd6ddbb)
+#define ZSW_MD5_T50    0x432aff97
+#define ZSW_MD5_T51 /* 0xab9423a7 */ (ZSW_MD5_T_MASK ^ 0x546bdc58)
+#define ZSW_MD5_T52 /* 0xfc93a039 */ (ZSW_MD5_T_MASK ^ 0x036c5fc6)
+#define ZSW_MD5_T53    0x655b59c3
+#define ZSW_MD5_T54 /* 0x8f0ccc92 */ (ZSW_MD5_T_MASK ^ 0x70f3336d)
+#define ZSW_MD5_T55 /* 0xffeff47d */ (ZSW_MD5_T_MASK ^ 0x00100b82)
+#define ZSW_MD5_T56 /* 0x85845dd1 */ (ZSW_MD5_T_MASK ^ 0x7a7ba22e)
+#define ZSW_MD5_T57    0x6fa87e4f
+#define ZSW_MD5_T58 /* 0xfe2ce6e0 */ (ZSW_MD5_T_MASK ^ 0x01d3191f)
+#define ZSW_MD5_T59 /* 0xa3014314 */ (ZSW_MD5_T_MASK ^ 0x5cfebceb)
+#define ZSW_MD5_T60    0x4e0811a1
+#define ZSW_MD5_T61 /* 0xf7537e82 */ (ZSW_MD5_T_MASK ^ 0x08ac817d)
+#define ZSW_MD5_T62 /* 0xbd3af235 */ (ZSW_MD5_T_MASK ^ 0x42c50dca)
+#define ZSW_MD5_T63    0x2ad7d2bb
+#define ZSW_MD5_T64 /* 0xeb86d391 */ (ZSW_MD5_T_MASK ^ 0x14792c6e)
+
+static void md5_process(md5_state_t *pms, md5_byte_t const * data /*[64]*/) {
+    md5_word_t
+    a = pms->abcd[0], b = pms->abcd[1],
+    c = pms->abcd[2], d = pms->abcd[3];
+    md5_word_t t;
+#if ZSW_MD5_BYTE_ORDER > 0
+    /* Define storage only for big-endian CPUs. */
+    md5_word_t X[16];
+#else
+    /* Define storage for little-endian or both types of CPUs. */
+    md5_word_t xbuf[16];
+    md5_word_t const * X;
+#endif
+
+    {
+#if ZSW_MD5_BYTE_ORDER == 0
+    /*
+     * Determine dynamically whether this is a big-endian or
+     * little-endian machine, since we can use a more efficient
+     * algorithm on the latter.
+     */
+    static int const w = 1;
+
+    if (*((md5_byte_t const *)&w)) /* dynamic little-endian */
+#endif
+#if ZSW_MD5_BYTE_ORDER <= 0     /* little-endian */
+    {
+        /*
+         * On little-endian machines, we can process properly aligned
+         * data without copying it.
+         */
+        if (!((data - (md5_byte_t const *)0) & 3)) {
+        /* data are properly aligned */
+        X = (md5_word_t const *)data;
+        } else {
+        /* not aligned */
+        std::memcpy(xbuf, data, 64);
+        X = xbuf;
+        }
+    }
+#endif
+#if ZSW_MD5_BYTE_ORDER == 0
+    else            /* dynamic big-endian */
+#endif
+#if ZSW_MD5_BYTE_ORDER >= 0     /* big-endian */
+    {
+        /*
+         * On big-endian machines, we must arrange the bytes in the
+         * right order.
+         */
+        const md5_byte_t *xp = data;
+        int i;
+
+#  if ZSW_MD5_BYTE_ORDER == 0
+        X = xbuf;       /* (dynamic only) */
+#  else
+#    define xbuf X      /* (static only) */
+#  endif
+        for (i = 0; i < 16; ++i, xp += 4)
+        xbuf[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
+    }
+#endif
+    }
+
+#define ZSW_MD5_ROTATE_LEFT(x, n) (((x) << (n)) | ((x) >> (32 - (n))))
+
+    /* Round 1. */
+    /* Let [abcd k s i] denote the operation
+       a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
+#define ZSW_MD5_F(x, y, z) (((x) & (y)) | (~(x) & (z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + ZSW_MD5_F(b,c,d) + X[k] + Ti;\
+  a = ZSW_MD5_ROTATE_LEFT(t, s) + b
+    /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  7,  ZSW_MD5_T1);
+    SET(d, a, b, c,  1, 12,  ZSW_MD5_T2);
+    SET(c, d, a, b,  2, 17,  ZSW_MD5_T3);
+    SET(b, c, d, a,  3, 22,  ZSW_MD5_T4);
+    SET(a, b, c, d,  4,  7,  ZSW_MD5_T5);
+    SET(d, a, b, c,  5, 12,  ZSW_MD5_T6);
+    SET(c, d, a, b,  6, 17,  ZSW_MD5_T7);
+    SET(b, c, d, a,  7, 22,  ZSW_MD5_T8);
+    SET(a, b, c, d,  8,  7,  ZSW_MD5_T9);
+    SET(d, a, b, c,  9, 12, ZSW_MD5_T10);
+    SET(c, d, a, b, 10, 17, ZSW_MD5_T11);
+    SET(b, c, d, a, 11, 22, ZSW_MD5_T12);
+    SET(a, b, c, d, 12,  7, ZSW_MD5_T13);
+    SET(d, a, b, c, 13, 12, ZSW_MD5_T14);
+    SET(c, d, a, b, 14, 17, ZSW_MD5_T15);
+    SET(b, c, d, a, 15, 22, ZSW_MD5_T16);
+#undef SET
+
+     /* Round 2. */
+     /* Let [abcd k s i] denote the operation
+          a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
+#define ZSW_MD5_G(x, y, z) (((x) & (z)) | ((y) & ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + ZSW_MD5_G(b,c,d) + X[k] + Ti;\
+  a = ZSW_MD5_ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  1,  5, ZSW_MD5_T17);
+    SET(d, a, b, c,  6,  9, ZSW_MD5_T18);
+    SET(c, d, a, b, 11, 14, ZSW_MD5_T19);
+    SET(b, c, d, a,  0, 20, ZSW_MD5_T20);
+    SET(a, b, c, d,  5,  5, ZSW_MD5_T21);
+    SET(d, a, b, c, 10,  9, ZSW_MD5_T22);
+    SET(c, d, a, b, 15, 14, ZSW_MD5_T23);
+    SET(b, c, d, a,  4, 20, ZSW_MD5_T24);
+    SET(a, b, c, d,  9,  5, ZSW_MD5_T25);
+    SET(d, a, b, c, 14,  9, ZSW_MD5_T26);
+    SET(c, d, a, b,  3, 14, ZSW_MD5_T27);
+    SET(b, c, d, a,  8, 20, ZSW_MD5_T28);
+    SET(a, b, c, d, 13,  5, ZSW_MD5_T29);
+    SET(d, a, b, c,  2,  9, ZSW_MD5_T30);
+    SET(c, d, a, b,  7, 14, ZSW_MD5_T31);
+    SET(b, c, d, a, 12, 20, ZSW_MD5_T32);
+#undef SET
+
+     /* Round 3. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
+#define ZSW_MD5_H(x, y, z) ((x) ^ (y) ^ (z))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + ZSW_MD5_H(b,c,d) + X[k] + Ti;\
+  a = ZSW_MD5_ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  5,  4, ZSW_MD5_T33);
+    SET(d, a, b, c,  8, 11, ZSW_MD5_T34);
+    SET(c, d, a, b, 11, 16, ZSW_MD5_T35);
+    SET(b, c, d, a, 14, 23, ZSW_MD5_T36);
+    SET(a, b, c, d,  1,  4, ZSW_MD5_T37);
+    SET(d, a, b, c,  4, 11, ZSW_MD5_T38);
+    SET(c, d, a, b,  7, 16, ZSW_MD5_T39);
+    SET(b, c, d, a, 10, 23, ZSW_MD5_T40);
+    SET(a, b, c, d, 13,  4, ZSW_MD5_T41);
+    SET(d, a, b, c,  0, 11, ZSW_MD5_T42);
+    SET(c, d, a, b,  3, 16, ZSW_MD5_T43);
+    SET(b, c, d, a,  6, 23, ZSW_MD5_T44);
+    SET(a, b, c, d,  9,  4, ZSW_MD5_T45);
+    SET(d, a, b, c, 12, 11, ZSW_MD5_T46);
+    SET(c, d, a, b, 15, 16, ZSW_MD5_T47);
+    SET(b, c, d, a,  2, 23, ZSW_MD5_T48);
+#undef SET
+
+     /* Round 4. */
+     /* Let [abcd k s t] denote the operation
+          a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
+#define ZSW_MD5_I(x, y, z) ((y) ^ ((x) | ~(z)))
+#define SET(a, b, c, d, k, s, Ti)\
+  t = a + ZSW_MD5_I(b,c,d) + X[k] + Ti;\
+  a = ZSW_MD5_ROTATE_LEFT(t, s) + b
+     /* Do the following 16 operations. */
+    SET(a, b, c, d,  0,  6, ZSW_MD5_T49);
+    SET(d, a, b, c,  7, 10, ZSW_MD5_T50);
+    SET(c, d, a, b, 14, 15, ZSW_MD5_T51);
+    SET(b, c, d, a,  5, 21, ZSW_MD5_T52);
+    SET(a, b, c, d, 12,  6, ZSW_MD5_T53);
+    SET(d, a, b, c,  3, 10, ZSW_MD5_T54);
+    SET(c, d, a, b, 10, 15, ZSW_MD5_T55);
+    SET(b, c, d, a,  1, 21, ZSW_MD5_T56);
+    SET(a, b, c, d,  8,  6, ZSW_MD5_T57);
+    SET(d, a, b, c, 15, 10, ZSW_MD5_T58);
+    SET(c, d, a, b,  6, 15, ZSW_MD5_T59);
+    SET(b, c, d, a, 13, 21, ZSW_MD5_T60);
+    SET(a, b, c, d,  4,  6, ZSW_MD5_T61);
+    SET(d, a, b, c, 11, 10, ZSW_MD5_T62);
+    SET(c, d, a, b,  2, 15, ZSW_MD5_T63);
+    SET(b, c, d, a,  9, 21, ZSW_MD5_T64);
+#undef SET
+
+     /* Then perform the following additions. (That is increment each
+        of the four registers by the value it had before this block
+        was started.) */
+    pms->abcd[0] += a;
+    pms->abcd[1] += b;
+    pms->abcd[2] += c;
+    pms->abcd[3] += d;
+}
+
+void md5_init(md5_state_t *pms) {
+    pms->count[0] = pms->count[1] = 0;
+    pms->abcd[0] = 0x67452301;
+    pms->abcd[1] = /*0xefcdab89*/ ZSW_MD5_T_MASK ^ 0x10325476;
+    pms->abcd[2] = /*0x98badcfe*/ ZSW_MD5_T_MASK ^ 0x67452301;
+    pms->abcd[3] = 0x10325476;
+}
+
+void md5_append(md5_state_t *pms, md5_byte_t const * data, size_t nbytes) {
+    md5_byte_t const * p = data;
+    size_t left = nbytes;
+    int offset = (pms->count[0] >> 3) & 63;
+    md5_word_t nbits = (md5_word_t)(nbytes << 3);
+
+    if (nbytes <= 0)
+    return;
+
+    /* Update the message length. */
+    pms->count[1] += nbytes >> 29;
+    pms->count[0] += nbits;
+    if (pms->count[0] < nbits)
+    pms->count[1]++;
+
+    /* Process an initial partial block. */
+    if (offset) {
+    int copy = (offset + nbytes > 64 ? 64 - offset : static_cast<int>(nbytes));
+
+    std::memcpy(pms->buf + offset, p, copy);
+    if (offset + copy < 64)
+        return;
+    p += copy;
+    left -= copy;
+    md5_process(pms, pms->buf);
+    }
+
+    /* Process full blocks. */
+    for (; left >= 64; p += 64, left -= 64)
+    md5_process(pms, p);
+
+    /* Process a final partial block. */
+    if (left)
+    std::memcpy(pms->buf, p, left);
+}
+
+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]) {
+    static md5_byte_t const pad[64] = {
+    0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+    };
+    md5_byte_t data[8];
+    int i;
+
+    /* Save the length before padding. */
+    for (i = 0; i < 8; ++i)
+    data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
+    /* Pad to 56 bytes mod 64. */
+    md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
+    /* Append the length. */
+    md5_append(pms, data, 8);
+    for (i = 0; i < 16; ++i)
+    digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
+}
+
+// some convenience c++ functions
+inline std::string md5_hash_string(std::string const & s) {
+    char digest[16];
+
+    md5_state_t state;
+
+    md5_init(&state);
+    md5_append(&state, (md5_byte_t const *)s.c_str(), s.size());
+    md5_finish(&state, (md5_byte_t *)digest);
+
+    std::string ret;
+    ret.resize(16);
+    std::copy(digest,digest+16,ret.begin());
+
+    return ret;
+}
+
+const char hexval[16] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
+
+inline std::string md5_hash_hex(std::string const & input) {
+    std::string hash = md5_hash_string(input);
+    std::string hex;
+
+    for (size_t i = 0; i < hash.size(); i++) {
+        hex.push_back(hexval[((hash[i] >> 4) & 0xF)]);
+        hex.push_back(hexval[(hash[i]) & 0x0F]);
+    }
+
+    return hex;
+}
+
+} // md5
+} // websocketpp
+
+#endif // WEBSOCKETPP_COMMON_MD5_HPP
diff --git a/vendor/websocketpp/websocketpp/common/memory.hpp b/vendor/websocketpp/websocketpp/common/memory.hpp
new file mode 100644
index 0000000..581aa55
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/memory.hpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_MEMORY_HPP
+#define WEBSOCKETPP_COMMON_MEMORY_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 memory header, then prefer it to
+// boost.
+#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
+    #ifndef _WEBSOCKETPP_CPP11_MEMORY_
+        #define _WEBSOCKETPP_CPP11_MEMORY_
+    #endif
+#endif
+
+// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
+// the use of C++11 functional header then prefer it to boost.
+#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
+    #ifndef _WEBSOCKETPP_CPP11_MEMORY_
+        #define _WEBSOCKETPP_CPP11_MEMORY_
+    #endif
+#endif
+
+
+
+#ifdef _WEBSOCKETPP_CPP11_MEMORY_
+    #include <memory>
+#else
+    #include <boost/shared_ptr.hpp>
+	#include <boost/make_shared.hpp>
+    #include <boost/scoped_array.hpp>
+    #include <boost/enable_shared_from_this.hpp>
+    #include <boost/pointer_cast.hpp>
+#endif
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef _WEBSOCKETPP_CPP11_MEMORY_
+    using std::shared_ptr;
+    using std::weak_ptr;
+    using std::auto_ptr;
+    using std::enable_shared_from_this;
+    using std::static_pointer_cast;
+    using std::make_shared;
+    using std::unique_ptr;
+
+    typedef std::unique_ptr<unsigned char[]> unique_ptr_uchar_array;
+#else
+    using boost::shared_ptr;
+    using boost::weak_ptr;
+    using std::auto_ptr;
+    using boost::enable_shared_from_this;
+    using boost::static_pointer_cast;
+    using boost::make_shared;
+
+    typedef boost::scoped_array<unsigned char> unique_ptr_uchar_array;
+#endif
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_MEMORY_HPP
diff --git a/vendor/websocketpp/websocketpp/common/network.hpp b/vendor/websocketpp/websocketpp/common/network.hpp
new file mode 100644
index 0000000..26a4cb9
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/network.hpp
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_NETWORK_HPP
+#define WEBSOCKETPP_COMMON_NETWORK_HPP
+
+// For ntohs and htons
+#if defined(_WIN32)
+    #include <winsock2.h>
+#else
+    //#include <arpa/inet.h>
+    #include <netinet/in.h>
+#endif
+
+#include <websocketpp/common/stdint.hpp>
+
+namespace websocketpp {
+namespace lib {
+namespace net {
+
+inline bool is_little_endian() {
+    short int val = 0x1;
+    char *ptr = reinterpret_cast<char *>(&val);
+    return (ptr[0] == 1);
+}
+
+#define TYP_INIT 0
+#define TYP_SMLE 1
+#define TYP_BIGE 2
+
+/// Convert 64 bit value to network byte order
+/**
+ * This method is prefixed to avoid conflicts with operating system level
+ * macros for this functionality.
+ *
+ * TODO: figure out if it would be beneficial to use operating system level
+ * macros for this.
+ *
+ * @param src The integer in host byte order
+ * @return src converted to network byte order
+ */
+inline uint64_t _htonll(uint64_t src) {
+    static int typ = TYP_INIT;
+    unsigned char c;
+    union {
+        uint64_t ull;
+        unsigned char c[8];
+    } x;
+    if (typ == TYP_INIT) {
+        x.ull = 0x01;
+        typ = (x.c[7] == 0x01ULL) ? TYP_BIGE : TYP_SMLE;
+    }
+    if (typ == TYP_BIGE)
+        return src;
+    x.ull = src;
+    c = x.c[0]; x.c[0] = x.c[7]; x.c[7] = c;
+    c = x.c[1]; x.c[1] = x.c[6]; x.c[6] = c;
+    c = x.c[2]; x.c[2] = x.c[5]; x.c[5] = c;
+    c = x.c[3]; x.c[3] = x.c[4]; x.c[4] = c;
+    return x.ull;
+}
+
+/// Convert 64 bit value to host byte order
+/**
+ * This method is prefixed to avoid conflicts with operating system level
+ * macros for this functionality.
+ *
+ * TODO: figure out if it would be beneficial to use operating system level
+ * macros for this.
+ *
+ * @param src The integer in network byte order
+ * @return src converted to host byte order
+ */
+inline uint64_t _ntohll(uint64_t src) {
+    return _htonll(src);
+}
+
+} // net
+} // lib
+} // websocketpp
+
+#endif // WEBSOCKETPP_COMMON_NETWORK_HPP
diff --git a/vendor/websocketpp/websocketpp/common/platforms.hpp b/vendor/websocketpp/websocketpp/common/platforms.hpp
new file mode 100644
index 0000000..8779857
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/platforms.hpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_PLATFORMS_HPP
+#define WEBSOCKETPP_COMMON_PLATFORMS_HPP
+
+/**
+ * This header contains any platform specific preprocessor adjustments that
+ * don't fit somewhere else better.
+ */
+
+#if defined(_WIN32) && !defined(NOMINMAX)
+    // don't define min and max macros that conflict with std::min and std::max
+    #define NOMINMAX
+#endif
+
+// Bump up the variadic parameter max for Visual Studio 2012
+#if defined(_MSC_VER) && _MSC_VER == 1700
+    #define _VARIADIC_MAX 8
+#endif
+
+#endif // WEBSOCKETPP_COMMON_PLATFORMS_HPP
diff --git a/vendor/websocketpp/websocketpp/common/random.hpp b/vendor/websocketpp/websocketpp/common/random.hpp
new file mode 100644
index 0000000..ddf9969
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/random.hpp
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP
+#define WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 random header, then prefer it to
+// boost.
+#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_RANDOM_DEVICE_
+    #ifndef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
+        #define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
+    #endif
+#endif
+
+
+// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
+// the use of C++11 random header then prefer it to boost.
+#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_MEMORY_
+    #ifndef _WEBSOCKETPP_CPP11_MEMORY_
+        #define _WEBSOCKETPP_CPP11_MEMORY_
+    #endif
+#endif
+
+
+
+#ifdef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
+    #include <random>
+#else
+    #include <boost/version.hpp>
+
+    #if (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) > 46
+        #include <boost/random/uniform_int_distribution.hpp>
+        #include <boost/random/random_device.hpp>
+    #elif (BOOST_VERSION/100000) == 1 && ((BOOST_VERSION/100)%1000) >= 43
+        #include <boost/nondet_random.hpp>
+    #else
+        // TODO: static_assert(false, "Could not find a suitable random_device")
+    #endif
+#endif
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
+    using std::random_device;
+    using std::uniform_int_distribution;
+#else
+    using boost::random::random_device;
+    using boost::random::uniform_int_distribution;
+#endif
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_RANDOM_DEVICE_HPP
diff --git a/vendor/websocketpp/websocketpp/common/regex.hpp b/vendor/websocketpp/websocketpp/common/regex.hpp
new file mode 100644
index 0000000..326635d
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/regex.hpp
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_REGEX_HPP
+#define WEBSOCKETPP_COMMON_REGEX_HPP
+
+#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_REGEX_
+    #ifndef _WEBSOCKETPP_CPP11_REGEX_
+        #define _WEBSOCKETPP_CPP11_REGEX_
+    #endif
+#endif
+
+#ifdef _WEBSOCKETPP_CPP11_REGEX_
+    #include <regex>
+#else
+    #include <boost/regex.hpp>
+#endif
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef _WEBSOCKETPP_CPP11_REGEX_
+    using std::cmatch;
+    using std::regex;
+    using std::regex_match;
+#else
+    using boost::cmatch;
+    using boost::regex;
+    using boost::regex_match;
+#endif
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_REGEX_HPP
diff --git a/vendor/websocketpp/websocketpp/common/stdint.hpp b/vendor/websocketpp/websocketpp/common/stdint.hpp
new file mode 100644
index 0000000..ec48ea7
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/stdint.hpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_STDINT_HPP
+#define WEBSOCKETPP_COMMON_STDINT_HPP
+
+#ifndef __STDC_LIMIT_MACROS
+    #define __STDC_LIMIT_MACROS 1
+#endif
+
+#if defined (_WIN32) && defined (_MSC_VER) && (_MSC_VER < 1600)
+    #include <boost/cstdint.hpp>
+
+    using boost::int8_t;
+    using boost::int_least8_t;
+    using boost::int_fast8_t;
+    using boost::uint8_t;
+    using boost::uint_least8_t;
+    using boost::uint_fast8_t;
+
+    using boost::int16_t;
+    using boost::int_least16_t;
+    using boost::int_fast16_t;
+    using boost::uint16_t;
+    using boost::uint_least16_t;
+    using boost::uint_fast16_t;
+
+    using boost::int32_t;
+    using boost::int_least32_t;
+    using boost::int_fast32_t;
+    using boost::uint32_t;
+    using boost::uint_least32_t;
+    using boost::uint_fast32_t;
+
+    #ifndef BOOST_NO_INT64_T
+    using boost::int64_t;
+    using boost::int_least64_t;
+    using boost::int_fast64_t;
+    using boost::uint64_t;
+    using boost::uint_least64_t;
+    using boost::uint_fast64_t;
+    #endif
+    using boost::intmax_t;
+    using boost::uintmax_t;
+#else
+    #include <stdint.h>
+#endif
+
+#endif // WEBSOCKETPP_COMMON_STDINT_HPP
diff --git a/vendor/websocketpp/websocketpp/common/system_error.hpp b/vendor/websocketpp/websocketpp/common/system_error.hpp
new file mode 100644
index 0000000..e5aea25
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/system_error.hpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
+#define WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
+
+
+#include <websocketpp/common/cpp11.hpp>
+
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 system_error header, then prefer it to
+// boost.
+#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_SYSTEM_ERROR_
+    #ifndef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+        #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+    #endif
+#endif
+
+// If we're on Visual Studio 2010 or higher and haven't explicitly disabled
+// the use of C++11 system_error header then prefer it to boost.
+#if defined(_MSC_VER) && _MSC_VER >= 1600 && !defined _WEBSOCKETPP_NO_CPP11_SYSTEM_ERROR_
+    #ifndef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+        #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+    #endif
+#endif
+
+
+
+#ifdef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+    #include <system_error>
+#else
+    #include <boost/system/error_code.hpp>
+    #include <boost/system/system_error.hpp>
+#endif
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+    using std::errc;
+    using std::error_code;
+    using std::error_category;
+    using std::error_condition;
+    using std::system_error;
+    #define _WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_ namespace std {
+    #define _WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_ }
+#else
+    namespace errc = boost::system::errc;
+    using boost::system::error_code;
+    using boost::system::error_category;
+    using boost::system::error_condition;
+    using boost::system::system_error;
+    #define _WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_ namespace boost { namespace system {
+    #define _WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_ }}
+#endif
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_SYSTEM_ERROR_HPP
diff --git a/vendor/websocketpp/websocketpp/common/thread.hpp b/vendor/websocketpp/websocketpp/common/thread.hpp
new file mode 100644
index 0000000..09f6b3c
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/thread.hpp
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_THREAD_HPP
+#define WEBSOCKETPP_COMMON_THREAD_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+
+// If we autodetect C++11 and haven't been explicitly instructed to not use
+// C++11 threads, then set the defines that instructs the rest of this header
+// to use C++11 <thread> and <mutex>
+#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_THREAD_
+    // MinGW by default does not support C++11 thread/mutex so even if the
+    // internal check for C++11 passes, ignore it if we are on MinGW
+    #if (!defined(__MINGW32__) && !defined(__MINGW64__))
+        #ifndef _WEBSOCKETPP_CPP11_THREAD_
+            #define _WEBSOCKETPP_CPP11_THREAD_
+        #endif
+    #endif
+#endif
+
+// If we're on Visual Studio 2013 or higher and haven't explicitly disabled
+// the use of C++11 thread header then prefer it to boost.
+#if defined(_MSC_VER) && _MSC_VER >= 1800 && !defined _WEBSOCKETPP_NO_CPP11_THREAD_
+    #ifndef _WEBSOCKETPP_CPP11_THREAD_
+        #define _WEBSOCKETPP_CPP11_THREAD_
+    #endif
+#endif
+
+#ifdef _WEBSOCKETPP_CPP11_THREAD_
+    #include <thread>
+    #include <mutex>
+    #include <condition_variable>
+#else
+    #include <boost/thread.hpp>
+    #include <boost/thread/mutex.hpp>
+    #include <boost/thread/condition_variable.hpp>
+#endif
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef _WEBSOCKETPP_CPP11_THREAD_
+    using std::mutex;
+    using std::lock_guard;
+    using std::thread;
+    using std::unique_lock;
+    using std::condition_variable;
+#else
+    using boost::mutex;
+    using boost::lock_guard;
+    using boost::thread;
+    using boost::unique_lock;
+    using boost::condition_variable;
+#endif
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_THREAD_HPP
diff --git a/vendor/websocketpp/websocketpp/common/time.hpp b/vendor/websocketpp/websocketpp/common/time.hpp
new file mode 100644
index 0000000..571688e
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/time.hpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_TIME_HPP
+#define WEBSOCKETPP_COMMON_TIME_HPP
+
+#include <ctime>
+
+namespace websocketpp {
+namespace lib {
+
+// Code in this header was inspired by the following article and includes some
+// code from the related project g2log. The g2log code is public domain licensed
+// http://kjellkod.wordpress.com/2013/01/22/exploring-c11-part-2-localtime-and-time-again/
+
+/// Thread safe cross platform localtime
+inline std::tm localtime(std::time_t const & time) {
+    std::tm tm_snapshot;
+#if (defined(__MINGW32__) || defined(__MINGW64__))
+    memcpy(&tm_snapshot, ::localtime(&time), sizeof(std::tm));
+#elif (defined(WIN32) || defined(_WIN32) || defined(__WIN32__))
+    localtime_s(&tm_snapshot, &time); 
+#else
+    localtime_r(&time, &tm_snapshot); // POSIX  
+#endif
+    return tm_snapshot;
+}
+
+} // lib
+} // websocketpp
+
+#endif // WEBSOCKETPP_COMMON_TIME_HPP
diff --git a/vendor/websocketpp/websocketpp/common/type_traits.hpp b/vendor/websocketpp/websocketpp/common/type_traits.hpp
new file mode 100644
index 0000000..c89b82b
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/common/type_traits.hpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_COMMON_TYPE_TRAITS_HPP
+#define WEBSOCKETPP_COMMON_TYPE_TRAITS_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+
+// If we've determined that we're in full C++11 mode and the user hasn't
+// explicitly disabled the use of C++11 functional header, then prefer it to
+// boost.
+#if defined _WEBSOCKETPP_CPP11_INTERNAL_ && !defined _WEBSOCKETPP_NO_CPP11_TYPE_TRAITS_
+    #ifndef _WEBSOCKETPP_CPP11_TYPE_TRAITS_
+        #define _WEBSOCKETPP_CPP11_TYPE_TRAITS_
+    #endif
+#endif
+
+
+#ifdef _WEBSOCKETPP_CPP11_TYPE_TRAITS_
+    #include <type_traits>
+#else
+    #include <boost/aligned_storage.hpp>
+#endif
+
+
+
+namespace websocketpp {
+namespace lib {
+
+#ifdef _WEBSOCKETPP_CPP11_TYPE_TRAITS_
+    using std::aligned_storage;
+    using std::is_same;
+#else
+    using boost::aligned_storage;
+    using boost::is_same;
+#endif
+
+} // namespace lib
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_COMMON_TYPE_TRAITS_HPP
diff --git a/vendor/websocketpp/websocketpp/concurrency/basic.hpp b/vendor/websocketpp/websocketpp/concurrency/basic.hpp
new file mode 100644
index 0000000..1943ad7
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/concurrency/basic.hpp
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONCURRENCY_BASIC_HPP
+#define WEBSOCKETPP_CONCURRENCY_BASIC_HPP
+
+#include <websocketpp/common/thread.hpp>
+
+namespace websocketpp {
+namespace concurrency {
+
+/// Concurrency policy that uses std::mutex / boost::mutex
+class basic {
+public:
+    typedef lib::mutex mutex_type;
+    typedef lib::lock_guard<mutex_type> scoped_lock_type;
+};
+
+} // namespace concurrency
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONCURRENCY_BASIC_HPP
diff --git a/vendor/websocketpp/websocketpp/concurrency/none.hpp b/vendor/websocketpp/websocketpp/concurrency/none.hpp
new file mode 100644
index 0000000..da9aa41
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/concurrency/none.hpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONCURRENCY_NONE_HPP
+#define WEBSOCKETPP_CONCURRENCY_NONE_HPP
+
+namespace websocketpp {
+
+/// Concurrency handling support
+namespace concurrency {
+
+/// Implementation for no-op locking primitives
+namespace none_impl {
+/// A fake mutex implementation that does nothing
+class fake_mutex {
+public:
+    fake_mutex() {}
+    ~fake_mutex() {}
+};
+
+/// A fake lock guard implementation that does nothing
+class fake_lock_guard {
+public:
+    explicit fake_lock_guard(fake_mutex) {}
+    ~fake_lock_guard() {}
+};
+} // namespace none_impl
+
+/// Stub concurrency policy that implements the interface using no-ops.
+/**
+ * This policy documents the concurrency policy interface using no-ops. It can
+ * be used as a reference or base for building a new concurrency policy. It can
+ * also be used as is to disable all locking for endpoints used in purely single
+ * threaded programs.
+ */
+class none {
+public:
+    /// The type of a mutex primitive
+    /**
+     * std::mutex is an example.
+     */
+    typedef none_impl::fake_mutex mutex_type;
+
+    /// The type of a scoped/RAII lock primitive.
+    /**
+     * The scoped lock constructor should take a mutex_type as a parameter,
+     * acquire that lock, and release it in its destructor. std::lock_guard is
+     * an example.
+     */
+    typedef none_impl::fake_lock_guard scoped_lock_type;
+};
+
+} // namespace concurrency
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONCURRENCY_ASYNC_HPP
diff --git a/vendor/websocketpp/websocketpp/config/asio.hpp b/vendor/websocketpp/websocketpp/config/asio.hpp
new file mode 100644
index 0000000..d28d0fb
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/asio.hpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_HPP
+#define WEBSOCKETPP_CONFIG_ASIO_TLS_HPP
+
+#include <websocketpp/config/core.hpp>
+#include <websocketpp/transport/asio/endpoint.hpp>
+#include <websocketpp/transport/asio/security/tls.hpp>
+
+// Pull in non-tls config
+#include <websocketpp/config/asio_no_tls.hpp>
+
+// Define TLS config
+namespace websocketpp {
+namespace config {
+
+/// Server config with asio transport and TLS enabled
+struct asio_tls : public core {
+    typedef asio_tls type;
+    typedef core base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_ASIO_TLS_HPP
diff --git a/vendor/websocketpp/websocketpp/config/asio_client.hpp b/vendor/websocketpp/websocketpp/config/asio_client.hpp
new file mode 100644
index 0000000..1cb594d
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/asio_client.hpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_CLIENT_HPP
+#define WEBSOCKETPP_CONFIG_ASIO_TLS_CLIENT_HPP
+
+#include <websocketpp/config/core_client.hpp>
+#include <websocketpp/transport/asio/endpoint.hpp>
+#include <websocketpp/transport/asio/security/tls.hpp>
+
+// Pull in non-tls config
+#include <websocketpp/config/asio_no_tls_client.hpp>
+
+// Define TLS config
+namespace websocketpp {
+namespace config {
+
+/// Client config with asio transport and TLS enabled
+struct asio_tls_client : public core_client {
+    typedef asio_tls_client type;
+    typedef core_client base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_ASIO_TLS_CLIENT_HPP
diff --git a/vendor/websocketpp/websocketpp/config/asio_no_tls.hpp b/vendor/websocketpp/websocketpp/config/asio_no_tls.hpp
new file mode 100644
index 0000000..6c1357f
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/asio_no_tls.hpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_ASIO_HPP
+#define WEBSOCKETPP_CONFIG_ASIO_HPP
+
+#include <websocketpp/config/core.hpp>
+#include <websocketpp/transport/asio/endpoint.hpp>
+
+namespace websocketpp {
+namespace config {
+
+/// Server config with asio transport and TLS disabled
+struct asio : public core {
+    typedef asio type;
+    typedef core base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_ASIO_HPP
diff --git a/vendor/websocketpp/websocketpp/config/asio_no_tls_client.hpp b/vendor/websocketpp/websocketpp/config/asio_no_tls_client.hpp
new file mode 100644
index 0000000..6e3f7ba
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/asio_no_tls_client.hpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_ASIO_CLIENT_HPP
+#define WEBSOCKETPP_CONFIG_ASIO_CLIENT_HPP
+
+#include <websocketpp/config/core_client.hpp>
+#include <websocketpp/transport/asio/endpoint.hpp>
+
+namespace websocketpp {
+namespace config {
+
+/// Client config with asio transport and TLS disabled
+struct asio_client : public core_client {
+    typedef asio_client type;
+    typedef core_client base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_ASIO_CLIENT_HPP
diff --git a/vendor/websocketpp/websocketpp/config/boost_config.hpp b/vendor/websocketpp/websocketpp/config/boost_config.hpp
new file mode 100644
index 0000000..57671cc
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/boost_config.hpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+ // This header defines WebSocket++ macros for C++11 compatibility based on the 
+ // Boost.Config library. This will correctly configure most target platforms
+ // simply by including this header before any other WebSocket++ header.
+
+#ifndef WEBSOCKETPP_CONFIG_BOOST_CONFIG_HPP
+#define WEBSOCKETPP_CONFIG_BOOST_CONFIG_HPP
+
+#include <boost/config.hpp>
+
+//  _WEBSOCKETPP_CPP11_MEMORY_ and _WEBSOCKETPP_CPP11_FUNCTIONAL_ presently
+//  only work if either both or neither is defined.
+#if !defined BOOST_NO_CXX11_SMART_PTR && !defined BOOST_NO_CXX11_HDR_FUNCTIONAL
+    #define _WEBSOCKETPP_CPP11_MEMORY_
+    #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
+#endif
+
+#ifdef BOOST_ASIO_HAS_STD_CHRONO
+    #define _WEBSOCKETPP_CPP11_CHRONO_
+#endif
+
+#ifndef BOOST_NO_CXX11_HDR_RANDOM
+    #define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
+#endif
+
+#ifndef BOOST_NO_CXX11_HDR_REGEX
+    #define _WEBSOCKETPP_CPP11_REGEX_
+#endif
+
+#ifndef BOOST_NO_CXX11_HDR_SYSTEM_ERROR
+    #define _WEBSOCKETPP_CPP11_SYSTEM_ERROR_
+#endif
+
+#ifndef BOOST_NO_CXX11_HDR_THREAD
+    #define _WEBSOCKETPP_CPP11_THREAD_
+#endif
+
+#ifndef BOOST_NO_CXX11_HDR_INITIALIZER_LIST
+    #define _WEBSOCKETPP_INITIALIZER_LISTS_
+#endif
+
+#define _WEBSOCKETPP_NOEXCEPT_TOKEN_  BOOST_NOEXCEPT
+#define _WEBSOCKETPP_CONSTEXPR_TOKEN_  BOOST_CONSTEXPR
+// TODO: nullptr support
+
+#endif // WEBSOCKETPP_CONFIG_BOOST_CONFIG_HPP
diff --git a/vendor/websocketpp/websocketpp/config/core.hpp b/vendor/websocketpp/websocketpp/config/core.hpp
new file mode 100644
index 0000000..a95b402
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/core.hpp
@@ -0,0 +1,285 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_CORE_HPP
+#define WEBSOCKETPP_CONFIG_CORE_HPP
+
+// Non-Policy common stuff
+#include <websocketpp/common/platforms.hpp>
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/stdint.hpp>
+
+// Concurrency
+#include <websocketpp/concurrency/basic.hpp>
+
+// Transport
+#include <websocketpp/transport/iostream/endpoint.hpp>
+
+// HTTP
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+
+// Messages
+#include <websocketpp/message_buffer/message.hpp>
+#include <websocketpp/message_buffer/alloc.hpp>
+
+// Loggers
+#include <websocketpp/logger/basic.hpp>
+
+// RNG
+#include <websocketpp/random/none.hpp>
+
+// User stub base classes
+#include <websocketpp/endpoint_base.hpp>
+#include <websocketpp/connection_base.hpp>
+
+// Extensions
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+
+namespace websocketpp {
+namespace config {
+
+/// Server config with iostream transport
+struct core {
+    typedef core type;
+
+    // Concurrency policy
+    typedef websocketpp::concurrency::basic concurrency_type;
+
+    // HTTP Parser Policies
+    typedef http::parser::request request_type;
+    typedef http::parser::response response_type;
+
+    // Message Policies
+    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
+        message_type;
+    typedef message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
+        endpoint_msg_manager_type;
+
+    /// Logging policies
+    typedef websocketpp::log::basic<concurrency_type,
+        websocketpp::log::elevel> elog_type;
+    typedef websocketpp::log::basic<concurrency_type,
+        websocketpp::log::alevel> alog_type;
+
+    /// RNG policies
+    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
+
+    /// Controls compile time enabling/disabling of thread syncronization
+    /// code Disabling can provide a minor performance improvement to single
+    /// threaded applications
+    static bool const enable_multithreading = true;
+
+    struct transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::elog_type elog_type;
+        typedef type::alog_type alog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+
+        /// Controls compile time enabling/disabling of thread syncronization
+        /// code Disabling can provide a minor performance improvement to single
+        /// threaded applications
+        static bool const enable_multithreading = true;
+
+        /// Default timer values (in ms)
+
+        /// Length of time to wait for socket pre-initialization
+        /**
+         * Exactly what this includes depends on the socket policy in use
+         */
+        static const long timeout_socket_pre_init = 5000;
+
+        /// Length of time to wait before a proxy handshake is aborted
+        static const long timeout_proxy = 5000;
+
+        /// Length of time to wait for socket post-initialization
+        /**
+         * Exactly what this includes depends on the socket policy in use.
+         * Often this means the TLS handshake
+         */
+        static const long timeout_socket_post_init = 5000;
+
+        /// Length of time to wait for dns resolution
+        static const long timeout_dns_resolve = 5000;
+
+        /// Length of time to wait for TCP connect
+        static const long timeout_connect = 5000;
+
+        /// Length of time to wait for socket shutdown
+        static const long timeout_socket_shutdown = 5000;
+    };
+
+    /// Transport Endpoint Component
+    typedef websocketpp::transport::iostream::endpoint<transport_config>
+        transport_type;
+
+    /// User overridable Endpoint base class
+    typedef websocketpp::endpoint_base endpoint_base;
+    /// User overridable Connection base class
+    typedef websocketpp::connection_base connection_base;
+
+    /// Default timer values (in ms)
+
+    /// Length of time before an opening handshake is aborted
+    static const long timeout_open_handshake = 5000;
+    /// Length of time before a closing handshake is aborted
+    static const long timeout_close_handshake = 5000;
+    /// Length of time to wait for a pong after a ping
+    static const long timeout_pong = 5000;
+
+    /// WebSocket Protocol version to use as a client
+    /**
+     * What version of the WebSocket Protocol to use for outgoing client
+     * connections. Setting this to a value other than 13 (RFC6455) is not
+     * recommended.
+     */
+    static const int client_version = 13; // RFC6455
+
+    /// Default static error logging channels
+    /**
+     * Which error logging channels to enable at compile time. Channels not
+     * enabled here will be unable to be selected by programs using the library.
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
+     * Default is all except for development/debug level errors
+     */
+    static const websocketpp::log::level elog_level =
+        websocketpp::log::elevel::all ^ websocketpp::log::elevel::devel;
+
+    /// Default static access logging channels
+    /**
+     * Which access logging channels to enable at compile time. Channels not
+     * enabled here will be unable to be selected by programs using the library.
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
+     * Default is all except for development/debug level access messages
+     */
+    static const websocketpp::log::level alog_level =
+        websocketpp::log::alevel::all ^ websocketpp::log::alevel::devel;
+
+    ///
+    static const size_t connection_read_buffer_size = 16384;
+
+    /// Drop connections immediately on protocol error.
+    /**
+     * Drop connections on protocol error rather than sending a close frame.
+     * Off by default. This may result in legit messages near the error being
+     * dropped as well. It may free up resources otherwise spent dealing with
+     * misbehaving clients.
+     */
+    static const bool drop_on_protocol_error = false;
+
+    /// Suppresses the return of detailed connection close information
+    /**
+     * Silence close suppresses the return of detailed connection close
+     * information during the closing handshake. This information is useful
+     * for debugging and presenting useful errors to end users but may be
+     * undesirable for security reasons in some production environments.
+     * Close reasons could be used by an attacker to confirm that the endpoint
+     * is out of resources or be used to identify the WebSocket implementation
+     * in use.
+     *
+     * Note: this will suppress *all* close codes, including those explicitly
+     * sent by local applications.
+     */
+    static const bool silent_close = false;
+
+    /// Default maximum message size
+    /**
+     * Default value for the processor's maximum message size. Maximum message size
+     * determines the point at which the library will fail a connection with the 
+     * message_too_big protocol error.
+     *
+     * The default is 32MB
+     *
+     * @since 0.3.0
+     */
+    static const size_t max_message_size = 32000000;
+    
+    /// Default maximum http body size
+    /**
+     * Default value for the http parser's maximum body size. Maximum body size
+     * determines the point at which the library will abort reading an HTTP
+     * connection with the 413/request entity too large error.
+     *
+     * The default is 32MB
+     *
+     * @since 0.5.0
+     */
+    static const size_t max_http_body_size = 32000000;
+
+    /// Global flag for enabling/disabling extensions
+    static const bool enable_extensions = true;
+
+    /// Extension specific settings:
+
+    /// permessage_compress extension
+    struct permessage_deflate_config {
+        typedef core::request_type request_type;
+
+        /// If the remote endpoint requests that we reset the compression
+        /// context after each message should we honor the request?
+        static const bool allow_disabling_context_takeover = true;
+
+        /// If the remote endpoint requests that we reduce the size of the
+        /// LZ77 sliding window size this is the lowest value that will be
+        /// allowed. Values range from 8 to 15. A value of 8 means we will
+        /// allow any possible window size. A value of 15 means do not allow
+        /// negotiation of the window size (ie require the default).
+        static const uint8_t minimum_outgoing_window_bits = 8;
+    };
+
+    typedef websocketpp::extensions::permessage_deflate::disabled
+        <permessage_deflate_config> permessage_deflate_type;
+
+    /// Autonegotiate permessage-deflate
+    /**
+     * Automatically enables the permessage-deflate extension.
+     *
+     * For clients this results in a permessage-deflate extension request being
+     * sent with every request rather than requiring it to be requested manually
+     *
+     * For servers this results in accepting the first set of extension settings
+     * requested by the client that we understand being used. The alternative is
+     * requiring the extension to be manually negotiated in `validate`. With
+     * auto-negotiate on, you may still override the auto-negotiate manually if
+     * needed.
+     */
+    //static const bool autonegotiate_compression = false;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_CORE_HPP
diff --git a/vendor/websocketpp/websocketpp/config/core_client.hpp b/vendor/websocketpp/websocketpp/config/core_client.hpp
new file mode 100644
index 0000000..dadf8a4
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/core_client.hpp
@@ -0,0 +1,294 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_CORE_CLIENT_HPP
+#define WEBSOCKETPP_CONFIG_CORE_CLIENT_HPP
+
+// Non-Policy common stuff
+#include <websocketpp/common/platforms.hpp>
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/stdint.hpp>
+
+// Concurrency
+#ifndef _WEBSOCKETPP_NO_THREADING_
+#include <websocketpp/concurrency/basic.hpp>
+#else
+#include <websocketpp/concurrency/none.hpp>
+#endif
+
+// Transport
+#include <websocketpp/transport/iostream/endpoint.hpp>
+
+// HTTP
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+
+// Messages
+#include <websocketpp/message_buffer/message.hpp>
+#include <websocketpp/message_buffer/alloc.hpp>
+
+// Loggers
+#include <websocketpp/logger/basic.hpp>
+
+// RNG
+#include <websocketpp/random/random_device.hpp>
+
+// User stub base classes
+#include <websocketpp/endpoint_base.hpp>
+#include <websocketpp/connection_base.hpp>
+
+// Extensions
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+
+namespace websocketpp {
+namespace config {
+
+/// Client config with iostream transport
+struct core_client {
+    typedef core_client type;
+
+    // Concurrency policy
+#ifndef _WEBSOCKETPP_NO_THREADING_
+    typedef websocketpp::concurrency::basic concurrency_type;
+#else
+    typedef websocketpp::concurrency::none concurrency_type;
+#endif
+
+    // HTTP Parser Policies
+    typedef http::parser::request request_type;
+    typedef http::parser::response response_type;
+
+    // Message Policies
+    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
+        message_type;
+    typedef message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
+        endpoint_msg_manager_type;
+
+    /// Logging policies
+    typedef websocketpp::log::basic<concurrency_type,
+        websocketpp::log::elevel> elog_type;
+    typedef websocketpp::log::basic<concurrency_type,
+        websocketpp::log::alevel> alog_type;
+
+    /// RNG policies
+    typedef websocketpp::random::random_device::int_generator<uint32_t,
+        concurrency_type> rng_type;
+
+    /// Controls compile time enabling/disabling of thread syncronization code
+    /// Disabling can provide a minor performance improvement to single threaded
+    /// applications
+    static bool const enable_multithreading = true;
+
+    struct transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::elog_type elog_type;
+        typedef type::alog_type alog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+
+        /// Controls compile time enabling/disabling of thread syncronization
+        /// code Disabling can provide a minor performance improvement to single
+        /// threaded applications
+        static bool const enable_multithreading = true;
+
+        /// Default timer values (in ms)
+
+        /// Length of time to wait for socket pre-initialization
+        /**
+         * Exactly what this includes depends on the socket policy in use
+         */
+        static const long timeout_socket_pre_init = 5000;
+
+        /// Length of time to wait before a proxy handshake is aborted
+        static const long timeout_proxy = 5000;
+
+        /// Length of time to wait for socket post-initialization
+        /**
+         * Exactly what this includes depends on the socket policy in use.
+         * Often this means the TLS handshake
+         */
+        static const long timeout_socket_post_init = 5000;
+
+        /// Length of time to wait for dns resolution
+        static const long timeout_dns_resolve = 5000;
+
+        /// Length of time to wait for TCP connect
+        static const long timeout_connect = 5000;
+
+        /// Length of time to wait for socket shutdown
+        static const long timeout_socket_shutdown = 5000;
+    };
+
+    /// Transport Endpoint Component
+    typedef websocketpp::transport::iostream::endpoint<transport_config>
+        transport_type;
+
+    /// User overridable Endpoint base class
+    typedef websocketpp::endpoint_base endpoint_base;
+    /// User overridable Connection base class
+    typedef websocketpp::connection_base connection_base;
+
+    /// Default timer values (in ms)
+
+    /// Length of time before an opening handshake is aborted
+    static const long timeout_open_handshake = 5000;
+    /// Length of time before a closing handshake is aborted
+    static const long timeout_close_handshake = 5000;
+    /// Length of time to wait for a pong after a ping
+    static const long timeout_pong = 5000;
+
+    /// WebSocket Protocol version to use as a client
+    /**
+     * What version of the WebSocket Protocol to use for outgoing client
+     * connections. Setting this to a value other than 13 (RFC6455) is not
+     * recommended.
+     */
+    static const int client_version = 13; // RFC6455
+
+    /// Default static error logging channels
+    /**
+     * Which error logging channels to enable at compile time. Channels not
+     * enabled here will be unable to be selected by programs using the library.
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
+     * Default is all except for development/debug level errors
+     */
+    static const websocketpp::log::level elog_level =
+        websocketpp::log::elevel::all ^ websocketpp::log::elevel::devel;
+
+    /// Default static access logging channels
+    /**
+     * Which access logging channels to enable at compile time. Channels not
+     * enabled here will be unable to be selected by programs using the library.
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
+     * Default is all except for development/debug level access messages
+     */
+    static const websocketpp::log::level alog_level =
+        websocketpp::log::alevel::all ^ websocketpp::log::alevel::devel;
+
+    ///
+    static const size_t connection_read_buffer_size = 16384;
+
+    /// Drop connections immediately on protocol error.
+    /**
+     * Drop connections on protocol error rather than sending a close frame.
+     * Off by default. This may result in legit messages near the error being
+     * dropped as well. It may free up resources otherwise spent dealing with
+     * misbehaving clients.
+     */
+    static const bool drop_on_protocol_error = false;
+
+    /// Suppresses the return of detailed connection close information
+    /**
+     * Silence close suppresses the return of detailed connection close
+     * information during the closing handshake. This information is useful
+     * for debugging and presenting useful errors to end users but may be
+     * undesirable for security reasons in some production environments.
+     * Close reasons could be used by an attacker to confirm that the endpoint
+     * is out of resources or be used to identify the WebSocket implementation
+     * in use.
+     *
+     * Note: this will suppress *all* close codes, including those explicitly
+     * sent by local applications.
+     */
+    static const bool silent_close = false;
+
+    /// Default maximum message size
+    /**
+     * Default value for the processor's maximum message size. Maximum message size
+     * determines the point at which the library will fail a connection with the 
+     * message_too_big protocol error.
+     *
+     * The default is 32MB
+     *
+     * @since 0.3.0
+     */
+    static const size_t max_message_size = 32000000;
+
+    /// Default maximum http body size
+    /**
+     * Default value for the http parser's maximum body size. Maximum body size
+     * determines the point at which the library will abort reading an HTTP
+     * connection with the 413/request entity too large error.
+     *
+     * The default is 32MB
+     *
+     * @since 0.5.0
+     */
+    static const size_t max_http_body_size = 32000000;
+
+    /// Global flag for enabling/disabling extensions
+    static const bool enable_extensions = true;
+
+    /// Extension specific settings:
+
+    /// permessage_deflate extension
+    struct permessage_deflate_config {
+        typedef core_client::request_type request_type;
+
+        /// If the remote endpoint requests that we reset the compression
+        /// context after each message should we honor the request?
+        static const bool allow_disabling_context_takeover = true;
+
+        /// If the remote endpoint requests that we reduce the size of the
+        /// LZ77 sliding window size this is the lowest value that will be
+        /// allowed. Values range from 8 to 15. A value of 8 means we will
+        /// allow any possible window size. A value of 15 means do not allow
+        /// negotiation of the window size (ie require the default).
+        static const uint8_t minimum_outgoing_window_bits = 8;
+    };
+
+    typedef websocketpp::extensions::permessage_deflate::disabled
+        <permessage_deflate_config> permessage_deflate_type;
+
+    /// Autonegotiate permessage-compress
+    /**
+     * Automatically enables the permessage-compress extension.
+     *
+     * For clients this results in a permessage-compress extension request being
+     * sent with every request rather than requiring it to be requested manually
+     *
+     * For servers this results in accepting the first set of extension settings
+     * requested by the client that we understand being used. The alternative is
+     * requiring the extension to be manually negotiated in `validate`. With
+     * auto-negotiate on, you may still override the auto-negotiate manually if
+     * needed.
+     */
+    //static const bool autonegotiate_compression = false;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_CORE_CLIENT_HPP
diff --git a/vendor/websocketpp/websocketpp/config/debug.hpp b/vendor/websocketpp/websocketpp/config/debug.hpp
new file mode 100644
index 0000000..223f72f
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/debug.hpp
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_DEBUG_HPP
+#define WEBSOCKETPP_CONFIG_DEBUG_HPP
+
+
+
+// Non-Policy common stuff
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/stdint.hpp>
+
+// Concurrency
+#include <websocketpp/concurrency/basic.hpp>
+
+// Transport
+#include <websocketpp/transport/iostream/endpoint.hpp>
+
+// HTTP
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+
+// Messages
+#include <websocketpp/message_buffer/message.hpp>
+#include <websocketpp/message_buffer/alloc.hpp>
+
+// Loggers
+#include <websocketpp/logger/basic.hpp>
+
+// RNG
+#include <websocketpp/random/none.hpp>
+
+// User stub base classes
+#include <websocketpp/endpoint_base.hpp>
+#include <websocketpp/connection_base.hpp>
+
+// Extensions
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+
+namespace websocketpp {
+namespace config {
+
+/// Client/Server debug config with iostream transport
+struct debug_core {
+    typedef debug_core type;
+
+    // Concurrency policy
+    typedef websocketpp::concurrency::basic concurrency_type;
+
+    // HTTP Parser Policies
+    typedef http::parser::request request_type;
+    typedef http::parser::response response_type;
+
+    // Message Policies
+    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
+        message_type;
+    typedef message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
+        endpoint_msg_manager_type;
+
+    /// Logging policies
+    typedef websocketpp::log::basic<concurrency_type,
+        websocketpp::log::elevel> elog_type;
+    typedef websocketpp::log::basic<concurrency_type,
+        websocketpp::log::alevel> alog_type;
+
+    /// RNG policies
+    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
+
+    /// Controls compile time enabling/disabling of thread syncronization
+    /// code Disabling can provide a minor performance improvement to single
+    /// threaded applications
+    static bool const enable_multithreading = true;
+
+    struct transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::elog_type elog_type;
+        typedef type::alog_type alog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+
+        /// Controls compile time enabling/disabling of thread syncronization
+        /// code Disabling can provide a minor performance improvement to single
+        /// threaded applications
+        static bool const enable_multithreading = true;
+
+        /// Default timer values (in ms)
+
+        /// Length of time to wait for socket pre-initialization
+        /**
+         * Exactly what this includes depends on the socket policy in use
+         */
+        static const long timeout_socket_pre_init = 5000;
+
+        /// Length of time to wait before a proxy handshake is aborted
+        static const long timeout_proxy = 5000;
+
+        /// Length of time to wait for socket post-initialization
+        /**
+         * Exactly what this includes depends on the socket policy in use.
+         * Often this means the TLS handshake
+         */
+        static const long timeout_socket_post_init = 5000;
+
+        /// Length of time to wait for dns resolution
+        static const long timeout_dns_resolve = 5000;
+
+        /// Length of time to wait for TCP connect
+        static const long timeout_connect = 5000;
+
+        /// Length of time to wait for socket shutdown
+        static const long timeout_socket_shutdown = 5000;
+    };
+
+    /// Transport Endpoint Component
+    typedef websocketpp::transport::iostream::endpoint<transport_config>
+        transport_type;
+
+    /// User overridable Endpoint base class
+    typedef websocketpp::endpoint_base endpoint_base;
+    /// User overridable Connection base class
+    typedef websocketpp::connection_base connection_base;
+
+    /// Default timer values (in ms)
+
+    /// Length of time before an opening handshake is aborted
+    static const long timeout_open_handshake = 5000;
+    /// Length of time before a closing handshake is aborted
+    static const long timeout_close_handshake = 5000;
+    /// Length of time to wait for a pong after a ping
+    static const long timeout_pong = 5000;
+
+    /// WebSocket Protocol version to use as a client
+    /**
+     * What version of the WebSocket Protocol to use for outgoing client
+     * connections. Setting this to a value other than 13 (RFC6455) is not
+     * recommended.
+     */
+    static const int client_version = 13; // RFC6455
+
+    /// Default static error logging channels
+    /**
+     * Which error logging channels to enable at compile time. Channels not
+     * enabled here will be unable to be selected by programs using the library.
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
+     * Default is all except for development/debug level errors
+     */
+    static const websocketpp::log::level elog_level =
+        websocketpp::log::elevel::all;
+
+    /// Default static access logging channels
+    /**
+     * Which access logging channels to enable at compile time. Channels not
+     * enabled here will be unable to be selected by programs using the library.
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
+     * Default is all except for development/debug level access messages
+     */
+    static const websocketpp::log::level alog_level =
+        websocketpp::log::alevel::all;
+
+    ///
+    static const size_t connection_read_buffer_size = 16384;
+
+    /// Drop connections immediately on protocol error.
+    /**
+     * Drop connections on protocol error rather than sending a close frame.
+     * Off by default. This may result in legit messages near the error being
+     * dropped as well. It may free up resources otherwise spent dealing with
+     * misbehaving clients.
+     */
+    static const bool drop_on_protocol_error = false;
+
+    /// Suppresses the return of detailed connection close information
+    /**
+     * Silence close suppresses the return of detailed connection close
+     * information during the closing handshake. This information is useful
+     * for debugging and presenting useful errors to end users but may be
+     * undesirable for security reasons in some production environments.
+     * Close reasons could be used by an attacker to confirm that the endpoint
+     * is out of resources or be used to identify the WebSocket implementation
+     * in use.
+     *
+     * Note: this will suppress *all* close codes, including those explicitly
+     * sent by local applications.
+     */
+    static const bool silent_close = false;
+
+    /// Default maximum message size
+    /**
+     * Default value for the processor's maximum message size. Maximum message size
+     * determines the point at which the library will fail a connection with the 
+     * message_too_big protocol error.
+     *
+     * The default is 32MB
+     *
+     * @since 0.3.0
+     */
+    static const size_t max_message_size = 32000000;
+
+    /// Default maximum http body size
+    /**
+     * Default value for the http parser's maximum body size. Maximum body size
+     * determines the point at which the library will abort reading an HTTP
+     * connection with the 413/request entity too large error.
+     *
+     * The default is 32MB
+     *
+     * @since 0.5.0
+     */
+    static const size_t max_http_body_size = 32000000;
+
+    /// Global flag for enabling/disabling extensions
+    static const bool enable_extensions = true;
+
+    /// Extension specific settings:
+
+    /// permessage_compress extension
+    struct permessage_deflate_config {
+        typedef type::request_type request_type;
+
+        /// If the remote endpoint requests that we reset the compression
+        /// context after each message should we honor the request?
+        static const bool allow_disabling_context_takeover = true;
+
+        /// If the remote endpoint requests that we reduce the size of the
+        /// LZ77 sliding window size this is the lowest value that will be
+        /// allowed. Values range from 8 to 15. A value of 8 means we will
+        /// allow any possible window size. A value of 15 means do not allow
+        /// negotiation of the window size (ie require the default).
+        static const uint8_t minimum_outgoing_window_bits = 8;
+    };
+
+    typedef websocketpp::extensions::permessage_deflate::disabled
+        <permessage_deflate_config> permessage_deflate_type;
+
+    /// Autonegotiate permessage-deflate
+    /**
+     * Automatically enables the permessage-deflate extension.
+     *
+     * For clients this results in a permessage-deflate extension request being
+     * sent with every request rather than requiring it to be requested manually
+     *
+     * For servers this results in accepting the first set of extension settings
+     * requested by the client that we understand being used. The alternative is
+     * requiring the extension to be manually negotiated in `validate`. With
+     * auto-negotiate on, you may still override the auto-negotiate manually if
+     * needed.
+     */
+    //static const bool autonegotiate_compression = false;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_CORE_HPP
diff --git a/vendor/websocketpp/websocketpp/config/debug_asio.hpp b/vendor/websocketpp/websocketpp/config/debug_asio.hpp
new file mode 100644
index 0000000..a57c736
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/debug_asio.hpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_ASIO_TLS_DEBUG_HPP
+#define WEBSOCKETPP_CONFIG_ASIO_TLS_DEBUG_HPP
+
+#include <websocketpp/config/debug.hpp>
+#include <websocketpp/transport/asio/endpoint.hpp>
+#include <websocketpp/transport/asio/security/tls.hpp>
+
+// Pull in non-tls config
+#include <websocketpp/config/debug_asio_no_tls.hpp>
+
+// Define TLS config
+namespace websocketpp {
+namespace config {
+
+/// Client/Server debug config with asio transport and TLS enabled
+struct debug_asio_tls : public debug_core {
+    typedef debug_asio_tls type;
+    typedef debug_core base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_ASIO_TLS_DEBUG_HPP
diff --git a/vendor/websocketpp/websocketpp/config/debug_asio_no_tls.hpp b/vendor/websocketpp/websocketpp/config/debug_asio_no_tls.hpp
new file mode 100644
index 0000000..b3dc83b
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/debug_asio_no_tls.hpp
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_ASIO_DEBUG_HPP
+#define WEBSOCKETPP_CONFIG_ASIO_DEBUG_HPP
+
+#include <websocketpp/config/debug.hpp>
+#include <websocketpp/transport/asio/endpoint.hpp>
+
+namespace websocketpp {
+namespace config {
+
+/// Client/Server debug config with asio transport and TLS disabled
+struct debug_asio : public debug_core {
+    typedef debug_asio type;
+    typedef debug_core base;
+
+    typedef base::concurrency_type concurrency_type;
+
+    typedef base::request_type request_type;
+    typedef base::response_type response_type;
+
+    typedef base::message_type message_type;
+    typedef base::con_msg_manager_type con_msg_manager_type;
+    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
+
+    typedef base::alog_type alog_type;
+    typedef base::elog_type elog_type;
+
+    typedef base::rng_type rng_type;
+
+    struct transport_config : public base::transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::alog_type alog_type;
+        typedef type::elog_type elog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+        typedef websocketpp::transport::asio::basic_socket::endpoint
+            socket_type;
+    };
+
+    typedef websocketpp::transport::asio::endpoint<transport_config>
+        transport_type;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_ASIO_DEBUG_HPP
diff --git a/vendor/websocketpp/websocketpp/config/minimal_client.hpp b/vendor/websocketpp/websocketpp/config/minimal_client.hpp
new file mode 100644
index 0000000..72528cd
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/minimal_client.hpp
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_MINIMAL_CLIENT_HPP
+#define WEBSOCKETPP_CONFIG_MINIMAL_CLIENT_HPP
+
+#include <websocketpp/config/minimal_server.hpp>
+
+namespace websocketpp {
+namespace config {
+
+/// Client config with minimal dependencies
+/**
+ * This config strips out as many dependencies as possible. It is suitable for
+ * use as a base class for custom configs that want to implement or choose their
+ * own policies for components that even the core config includes.
+ *
+ * NOTE: this config stubs out enough that it cannot be used directly. You must
+ * supply at least a transport policy and a cryptographically secure random 
+ * number generation policy for a config based on `minimal_client` to do 
+ * anything useful.
+ *
+ * Present dependency list for minimal_server config:
+ *
+ * C++98 STL:
+ * <algorithm>
+ * <map>
+ * <sstream>
+ * <string>
+ * <vector>
+ *
+ * C++11 STL or Boost
+ * <memory>
+ * <functional>
+ * <system_error>
+ *
+ * Operating System:
+ * <stdint.h> or <boost/cstdint.hpp>
+ * <netinet/in.h> or <winsock2.h> (for ntohl.. could potentially bundle this)
+ *
+ * @since 0.4.0-dev
+ */
+typedef minimal_server minimal_client;
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_MINIMAL_CLIENT_HPP
diff --git a/vendor/websocketpp/websocketpp/config/minimal_server.hpp b/vendor/websocketpp/websocketpp/config/minimal_server.hpp
new file mode 100644
index 0000000..dd1aedb
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/config/minimal_server.hpp
@@ -0,0 +1,312 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONFIG_MINIMAL_HPP
+#define WEBSOCKETPP_CONFIG_MINIMAL_HPP
+
+// Non-Policy common stuff
+#include <websocketpp/common/platforms.hpp>
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/stdint.hpp>
+
+// Concurrency
+#include <websocketpp/concurrency/none.hpp>
+
+// Transport
+#include <websocketpp/transport/stub/endpoint.hpp>
+
+// HTTP
+#include <websocketpp/http/request.hpp>
+#include <websocketpp/http/response.hpp>
+
+// Messages
+#include <websocketpp/message_buffer/message.hpp>
+#include <websocketpp/message_buffer/alloc.hpp>
+
+// Loggers
+#include <websocketpp/logger/stub.hpp>
+
+// RNG
+#include <websocketpp/random/none.hpp>
+
+// User stub base classes
+#include <websocketpp/endpoint_base.hpp>
+#include <websocketpp/connection_base.hpp>
+
+// Extensions
+#include <websocketpp/extensions/permessage_deflate/disabled.hpp>
+
+namespace websocketpp {
+namespace config {
+
+/// Server config with minimal dependencies
+/**
+ * This config strips out as many dependencies as possible. It is suitable for
+ * use as a base class for custom configs that want to implement or choose their
+ * own policies for components that even the core config includes.
+ *
+ * NOTE: this config stubs out enough that it cannot be used directly. You must
+ * supply at least a transport policy for a config based on `minimal_server` to
+ * do anything useful.
+ *
+ * Present dependency list for minimal_server config:
+ *
+ * C++98 STL:
+ * <algorithm>
+ * <map>
+ * <sstream>
+ * <string>
+ * <vector>
+ *
+ * C++11 STL or Boost
+ * <memory>
+ * <functional>
+ * <system_error>
+ *
+ * Operating System:
+ * <stdint.h> or <boost/cstdint.hpp>
+ * <netinet/in.h> or <winsock2.h> (for ntohl.. could potentially bundle this)
+ *
+ * @since 0.4.0-dev
+ */
+struct minimal_server {
+    typedef minimal_server type;
+
+    // Concurrency policy
+    typedef websocketpp::concurrency::none concurrency_type;
+
+    // HTTP Parser Policies
+    typedef http::parser::request request_type;
+    typedef http::parser::response response_type;
+
+    // Message Policies
+    typedef message_buffer::message<message_buffer::alloc::con_msg_manager>
+        message_type;
+    typedef message_buffer::alloc::con_msg_manager<message_type>
+        con_msg_manager_type;
+    typedef message_buffer::alloc::endpoint_msg_manager<con_msg_manager_type>
+        endpoint_msg_manager_type;
+
+    /// Logging policies
+    typedef websocketpp::log::stub elog_type;
+    typedef websocketpp::log::stub alog_type;
+
+    /// RNG policies
+    typedef websocketpp::random::none::int_generator<uint32_t> rng_type;
+
+    /// Controls compile time enabling/disabling of thread syncronization
+    /// code Disabling can provide a minor performance improvement to single
+    /// threaded applications
+    static bool const enable_multithreading = true;
+
+    struct transport_config {
+        typedef type::concurrency_type concurrency_type;
+        typedef type::elog_type elog_type;
+        typedef type::alog_type alog_type;
+        typedef type::request_type request_type;
+        typedef type::response_type response_type;
+
+        /// Controls compile time enabling/disabling of thread syncronization
+        /// code Disabling can provide a minor performance improvement to single
+        /// threaded applications
+        static bool const enable_multithreading = true;
+
+        /// Default timer values (in ms)
+
+        /// Length of time to wait for socket pre-initialization
+        /**
+         * Exactly what this includes depends on the socket policy in use
+         */
+        static const long timeout_socket_pre_init = 5000;
+
+        /// Length of time to wait before a proxy handshake is aborted
+        static const long timeout_proxy = 5000;
+
+        /// Length of time to wait for socket post-initialization
+        /**
+         * Exactly what this includes depends on the socket policy in use.
+         * Often this means the TLS handshake
+         */
+        static const long timeout_socket_post_init = 5000;
+
+        /// Length of time to wait for dns resolution
+        static const long timeout_dns_resolve = 5000;
+
+        /// Length of time to wait for TCP connect
+        static const long timeout_connect = 5000;
+
+        /// Length of time to wait for socket shutdown
+        static const long timeout_socket_shutdown = 5000;
+    };
+
+    /// Transport Endpoint Component
+    typedef websocketpp::transport::stub::endpoint<transport_config>
+        transport_type;
+
+    /// User overridable Endpoint base class
+    typedef websocketpp::endpoint_base endpoint_base;
+    /// User overridable Connection base class
+    typedef websocketpp::connection_base connection_base;
+
+    /// Default timer values (in ms)
+
+    /// Length of time before an opening handshake is aborted
+    static const long timeout_open_handshake = 5000;
+    /// Length of time before a closing handshake is aborted
+    static const long timeout_close_handshake = 5000;
+    /// Length of time to wait for a pong after a ping
+    static const long timeout_pong = 5000;
+
+    /// WebSocket Protocol version to use as a client
+    /**
+     * What version of the WebSocket Protocol to use for outgoing client
+     * connections. Setting this to a value other than 13 (RFC6455) is not
+     * recommended.
+     */
+    static const int client_version = 13; // RFC6455
+
+    /// Default static error logging channels
+    /**
+     * Which error logging channels to enable at compile time. Channels not
+     * enabled here will be unable to be selected by programs using the library.
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
+     * Default is all except for development/debug level errors
+     */
+    static const websocketpp::log::level elog_level =
+        websocketpp::log::elevel::none;
+
+    /// Default static access logging channels
+    /**
+     * Which access logging channels to enable at compile time. Channels not
+     * enabled here will be unable to be selected by programs using the library.
+     * This option gives an optimizing compiler the ability to remove entirely
+     * code to test whether or not to print out log messages on a certain
+     * channel
+     *
+     * Default is all except for development/debug level access messages
+     */
+    static const websocketpp::log::level alog_level =
+        websocketpp::log::alevel::none;
+
+    ///
+    static const size_t connection_read_buffer_size = 16384;
+
+    /// Drop connections immediately on protocol error.
+    /**
+     * Drop connections on protocol error rather than sending a close frame.
+     * Off by default. This may result in legit messages near the error being
+     * dropped as well. It may free up resources otherwise spent dealing with
+     * misbehaving clients.
+     */
+    static const bool drop_on_protocol_error = false;
+
+    /// Suppresses the return of detailed connection close information
+    /**
+     * Silence close suppresses the return of detailed connection close
+     * information during the closing handshake. This information is useful
+     * for debugging and presenting useful errors to end users but may be
+     * undesirable for security reasons in some production environments.
+     * Close reasons could be used by an attacker to confirm that the endpoint
+     * is out of resources or be used to identify the WebSocket implementation
+     * in use.
+     *
+     * Note: this will suppress *all* close codes, including those explicitly
+     * sent by local applications.
+     */
+    static const bool silent_close = false;
+
+    /// Default maximum message size
+    /**
+     * Default value for the processor's maximum message size. Maximum message size
+     * determines the point at which the library will fail a connection with the 
+     * message_too_big protocol error.
+     *
+     * The default is 32MB
+     *
+     * @since 0.4.0-alpha1
+     */
+    static const size_t max_message_size = 32000000;
+
+    /// Default maximum http body size
+    /**
+     * Default value for the http parser's maximum body size. Maximum body size
+     * determines the point at which the library will abort reading an HTTP
+     * connection with the 413/request entity too large error.
+     *
+     * The default is 32MB
+     *
+     * @since 0.5.0
+     */
+    static const size_t max_http_body_size = 32000000;
+
+    /// Global flag for enabling/disabling extensions
+    static const bool enable_extensions = true;
+
+    /// Extension specific settings:
+
+    /// permessage_compress extension
+    struct permessage_deflate_config {
+        typedef core::request_type request_type;
+
+        /// If the remote endpoint requests that we reset the compression
+        /// context after each message should we honor the request?
+        static const bool allow_disabling_context_takeover = true;
+
+        /// If the remote endpoint requests that we reduce the size of the
+        /// LZ77 sliding window size this is the lowest value that will be
+        /// allowed. Values range from 8 to 15. A value of 8 means we will
+        /// allow any possible window size. A value of 15 means do not allow
+        /// negotiation of the window size (ie require the default).
+        static const uint8_t minimum_outgoing_window_bits = 8;
+    };
+
+    typedef websocketpp::extensions::permessage_deflate::disabled
+        <permessage_deflate_config> permessage_deflate_type;
+
+    /// Autonegotiate permessage-deflate
+    /**
+     * Automatically enables the permessage-deflate extension.
+     *
+     * For clients this results in a permessage-deflate extension request being
+     * sent with every request rather than requiring it to be requested manually
+     *
+     * For servers this results in accepting the first set of extension settings
+     * requested by the client that we understand being used. The alternative is
+     * requiring the extension to be manually negotiated in `validate`. With
+     * auto-negotiate on, you may still override the auto-negotiate manually if
+     * needed.
+     */
+    //static const bool autonegotiate_compression = false;
+};
+
+} // namespace config
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONFIG_MINIMAL_HPP
diff --git a/vendor/websocketpp/websocketpp/connection.hpp b/vendor/websocketpp/websocketpp/connection.hpp
new file mode 100644
index 0000000..3bbbbb3
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/connection.hpp
@@ -0,0 +1,1651 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONNECTION_HPP
+#define WEBSOCKETPP_CONNECTION_HPP
+
+#include <websocketpp/close.hpp>
+#include <websocketpp/error.hpp>
+#include <websocketpp/frame.hpp>
+
+#include <websocketpp/logger/levels.hpp>
+#include <websocketpp/processors/processor.hpp>
+#include <websocketpp/transport/base/connection.hpp>
+#include <websocketpp/http/constants.hpp>
+
+#include <websocketpp/common/connection_hdl.hpp>
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/functional.hpp>
+
+#include <queue>
+#include <sstream>
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+
+/// The type and function signature of an open handler
+/**
+ * The open handler is called once for every successful WebSocket connection
+ * attempt. Either the fail handler or the open handler will be called for each
+ * WebSocket connection attempt. HTTP Connections that did not attempt to
+ * upgrade the connection to the WebSocket protocol will trigger the http
+ * handler instead of fail/open.
+ */
+typedef lib::function<void(connection_hdl)> open_handler;
+
+/// The type and function signature of a close handler
+/**
+ * The close handler is called once for every successfully established
+ * connection after it is no longer capable of sending or receiving new messages
+ *
+ * The close handler will be called exactly once for every connection for which
+ * the open handler was called.
+ */
+typedef lib::function<void(connection_hdl)> close_handler;
+
+/// The type and function signature of a fail handler
+/**
+ * The fail handler is called once for every unsuccessful WebSocket connection
+ * attempt. Either the fail handler or the open handler will be called for each
+ * WebSocket connection attempt. HTTP Connections that did not attempt to
+ * upgrade the connection to the WebSocket protocol will trigger the http
+ * handler instead of fail/open.
+ */
+typedef lib::function<void(connection_hdl)> fail_handler;
+
+/// The type and function signature of an interrupt handler
+/**
+ * The interrupt handler is called when a connection receives an interrupt
+ * request from the application. Interrupts allow the application to trigger a
+ * handler to be run in the absense of a WebSocket level handler trigger (like
+ * a new message).
+ *
+ * This is typically used by another application thread to schedule some tasks
+ * that can only be run from within the handler chain for thread safety reasons.
+ */
+typedef lib::function<void(connection_hdl)> interrupt_handler;
+
+/// The type and function signature of a ping handler
+/**
+ * The ping handler is called when the connection receives a WebSocket ping
+ * control frame. The string argument contains the ping payload. The payload is
+ * a binary string up to 126 bytes in length. The ping handler returns a bool,
+ * true if a pong response should be sent, false if the pong response should be
+ * suppressed.
+ */
+typedef lib::function<bool(connection_hdl,std::string)> ping_handler;
+
+/// The type and function signature of a pong handler
+/**
+ * The pong handler is called when the connection receives a WebSocket pong
+ * control frame. The string argument contains the pong payload. The payload is
+ * a binary string up to 126 bytes in length.
+ */
+typedef lib::function<void(connection_hdl,std::string)> pong_handler;
+
+/// The type and function signature of a pong timeout handler
+/**
+ * The pong timeout handler is called when a ping goes unanswered by a pong for
+ * longer than the locally specified timeout period.
+ */
+typedef lib::function<void(connection_hdl,std::string)> pong_timeout_handler;
+
+/// The type and function signature of a validate handler
+/**
+ * The validate handler is called after a WebSocket handshake has been received
+ * and processed but before it has been accepted. This gives the application a
+ * chance to implement connection details specific policies for accepting
+ * connections and the ability to negotiate extensions and subprotocols.
+ *
+ * The validate handler return value indicates whether or not the connection
+ * should be accepted. Additional methods may be called during the function to
+ * set response headers, set HTTP return/error codes, etc.
+ */
+typedef lib::function<bool(connection_hdl)> validate_handler;
+
+/// The type and function signature of a http handler
+/**
+ * The http handler is called when an HTTP connection is made that does not
+ * attempt to upgrade the connection to the WebSocket protocol. This allows
+ * WebSocket++ servers to respond to these requests with regular HTTP responses.
+ *
+ * This can be used to deliver error pages & dashboards and to deliver static
+ * files such as the base HTML & JavaScript for an otherwise single page
+ * WebSocket application.
+ *
+ * Note: WebSocket++ is designed to be a high performance WebSocket server. It
+ * is not tuned to provide a full featured, high performance, HTTP web server
+ * solution. The HTTP handler is appropriate only for low volume HTTP traffic.
+ * If you expect to serve high volumes of HTTP traffic a dedicated HTTP web
+ * server is strongly recommended.
+ *
+ * The default HTTP handler will return a 426 Upgrade Required error. Custom
+ * handlers may override the response status code to deliver any type of
+ * response.
+ */
+typedef lib::function<void(connection_hdl)> http_handler;
+
+//
+typedef lib::function<void(lib::error_code const & ec, size_t bytes_transferred)> read_handler;
+typedef lib::function<void(lib::error_code const & ec)> write_frame_handler;
+
+// constants related to the default WebSocket protocol versions available
+#ifdef _WEBSOCKETPP_INITIALIZER_LISTS_ // simplified C++11 version
+    /// Container that stores the list of protocol versions supported
+    /**
+     * @todo Move this to configs to allow compile/runtime disabling or enabling
+     * of protocol versions
+     */
+    static std::vector<int> const versions_supported = {0,7,8,13};
+#else
+    /// Helper array to get around lack of initializer lists pre C++11
+    static int const helper[] = {0,7,8,13};
+    /// Container that stores the list of protocol versions supported
+    /**
+     * @todo Move this to configs to allow compile/runtime disabling or enabling
+     * of protocol versions
+     */
+    static std::vector<int> const versions_supported(helper,helper+4);
+#endif
+
+namespace session {
+namespace state {
+    // externally visible session state (states based on the RFC)
+    enum value {
+        connecting = 0,
+        open = 1,
+        closing = 2,
+        closed = 3
+    };
+} // namespace state
+
+
+namespace fail {
+namespace status {
+    enum value {
+        GOOD = 0,           // no failure yet!
+        SYSTEM = 1,         // system call returned error, check that code
+        WEBSOCKET = 2,      // websocket close codes contain error
+        UNKNOWN = 3,        // No failure information is available
+        TIMEOUT_TLS = 4,    // TLS handshake timed out
+        TIMEOUT_WS = 5      // WS handshake timed out
+    };
+} // namespace status
+} // namespace fail
+
+namespace internal_state {
+    // More granular internal states. These are used for multi-threaded
+    // connection synchronization and preventing values that are not yet or no
+    // longer available from being used.
+
+    enum value {
+        USER_INIT = 0,
+        TRANSPORT_INIT = 1,
+        READ_HTTP_REQUEST = 2,
+        WRITE_HTTP_REQUEST = 3,
+        READ_HTTP_RESPONSE = 4,
+        WRITE_HTTP_RESPONSE = 5,
+        PROCESS_HTTP_REQUEST = 6,
+        PROCESS_CONNECTION = 7
+    };
+} // namespace internal_state
+
+
+namespace http_state {
+    // states to keep track of the progress of http connections
+
+    enum value {
+        init = 0,
+        deferred = 1,
+        headers_written = 2,
+        body_written = 3,
+        closed = 4
+    };
+} // namespace http_state
+
+} // namespace session
+
+/// Represents an individual WebSocket connection
+template <typename config>
+class connection
+ : public config::transport_type::transport_con_type
+ , public config::connection_base
+{
+public:
+    /// Type of this connection
+    typedef connection<config> type;
+    /// Type of a shared pointer to this connection
+    typedef lib::shared_ptr<type> ptr;
+    /// Type of a weak pointer to this connection
+    typedef lib::weak_ptr<type> weak_ptr;
+
+    /// Type of the concurrency component of this connection
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of the access logging policy
+    typedef typename config::alog_type alog_type;
+    /// Type of the error logging policy
+    typedef typename config::elog_type elog_type;
+
+    /// Type of the transport component of this connection
+    typedef typename config::transport_type::transport_con_type
+        transport_con_type;
+    /// Type of a shared pointer to the transport component of this connection
+    typedef typename transport_con_type::ptr transport_con_ptr;
+
+    typedef lib::function<void(ptr)> termination_handler;
+
+    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
+    typedef typename concurrency_type::mutex_type mutex_type;
+
+    typedef typename config::request_type request_type;
+    typedef typename config::response_type response_type;
+
+    typedef typename config::message_type message_type;
+    typedef typename message_type::ptr message_ptr;
+
+    typedef typename config::con_msg_manager_type con_msg_manager_type;
+    typedef typename con_msg_manager_type::ptr con_msg_manager_ptr;
+
+    /// Type of RNG
+    typedef typename config::rng_type rng_type;
+
+    typedef processor::processor<config> processor_type;
+    typedef lib::shared_ptr<processor_type> processor_ptr;
+
+    // Message handler (needs to know message type)
+    typedef lib::function<void(connection_hdl,message_ptr)> message_handler;
+
+    /// Type of a pointer to a transport timer handle
+    typedef typename transport_con_type::timer_ptr timer_ptr;
+
+    // Misc Convenience Types
+    typedef session::internal_state::value istate_type;
+
+private:
+    enum terminate_status {
+        failed = 1,
+        closed,
+        unknown
+    };
+public:
+
+    explicit connection(bool p_is_server, std::string const & ua, alog_type& alog,
+        elog_type& elog, rng_type & rng)
+      : transport_con_type(p_is_server, alog, elog)
+      , m_handle_read_frame(lib::bind(
+            &type::handle_read_frame,
+            this,
+            lib::placeholders::_1,
+            lib::placeholders::_2
+        ))
+      , m_write_frame_handler(lib::bind(
+            &type::handle_write_frame,
+            this,
+            lib::placeholders::_1
+        ))
+      , m_user_agent(ua)
+      , m_open_handshake_timeout_dur(config::timeout_open_handshake)
+      , m_close_handshake_timeout_dur(config::timeout_close_handshake)
+      , m_pong_timeout_dur(config::timeout_pong)
+      , m_max_message_size(config::max_message_size)
+      , m_state(session::state::connecting)
+      , m_internal_state(session::internal_state::USER_INIT)
+      , m_msg_manager(new con_msg_manager_type())
+      , m_send_buffer_size(0)
+      , m_write_flag(false)
+      , m_read_flag(true)
+      , m_is_server(p_is_server)
+      , m_alog(alog)
+      , m_elog(elog)
+      , m_rng(rng)
+      , m_local_close_code(close::status::abnormal_close)
+      , m_remote_close_code(close::status::abnormal_close)
+      , m_is_http(false)
+      , m_http_state(session::http_state::init)
+      , m_was_clean(false)
+    {
+        m_alog.write(log::alevel::devel,"connection constructor");
+    }
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return lib::static_pointer_cast<type>(transport_con_type::get_shared());
+    }
+
+    ///////////////////////////
+    // Set Handler Callbacks //
+    ///////////////////////////
+
+    /// Set open handler
+    /**
+     * The open handler is called after the WebSocket handshake is complete and
+     * the connection is considered OPEN.
+     *
+     * @param h The new open_handler
+     */
+    void set_open_handler(open_handler h) {
+        m_open_handler = h;
+    }
+
+    /// Set close handler
+    /**
+     * The close handler is called immediately after the connection is closed.
+     *
+     * @param h The new close_handler
+     */
+    void set_close_handler(close_handler h) {
+        m_close_handler = h;
+    }
+
+    /// Set fail handler
+    /**
+     * The fail handler is called whenever the connection fails while the
+     * handshake is bring processed.
+     *
+     * @param h The new fail_handler
+     */
+    void set_fail_handler(fail_handler h) {
+        m_fail_handler = h;
+    }
+
+    /// Set ping handler
+    /**
+     * The ping handler is called whenever the connection receives a ping
+     * control frame. The ping payload is included.
+     *
+     * The ping handler's return time controls whether or not a pong is
+     * sent in response to this ping. Returning false will suppress the
+     * return pong. If no ping handler is set a pong will be sent.
+     *
+     * @param h The new ping_handler
+     */
+    void set_ping_handler(ping_handler h) {
+        m_ping_handler = h;
+    }
+
+    /// Set pong handler
+    /**
+     * The pong handler is called whenever the connection receives a pong
+     * control frame. The pong payload is included.
+     *
+     * @param h The new pong_handler
+     */
+    void set_pong_handler(pong_handler h) {
+        m_pong_handler = h;
+    }
+
+    /// Set pong timeout handler
+    /**
+     * If the transport component being used supports timers, the pong timeout
+     * handler is called whenever a pong control frame is not received with the
+     * configured timeout period after the application sends a ping.
+     *
+     * The config setting `timeout_pong` controls the length of the timeout
+     * period. It is specified in milliseconds.
+     *
+     * This can be used to probe the health of the remote endpoint's WebSocket
+     * implementation. This does not guarantee that the remote application
+     * itself is still healthy but can be a useful diagnostic.
+     *
+     * Note: receipt of this callback doesn't mean the pong will never come.
+     * This functionality will not suppress delivery of the pong in question
+     * should it arrive after the timeout.
+     *
+     * @param h The new pong_timeout_handler
+     */
+    void set_pong_timeout_handler(pong_timeout_handler h) {
+        m_pong_timeout_handler = h;
+    }
+
+    /// Set interrupt handler
+    /**
+     * The interrupt handler is called whenever the connection is manually
+     * interrupted by the application.
+     *
+     * @param h The new interrupt_handler
+     */
+    void set_interrupt_handler(interrupt_handler h) {
+        m_interrupt_handler = h;
+    }
+
+    /// Set http handler
+    /**
+     * The http handler is called after an HTTP request other than a WebSocket
+     * upgrade request is received. It allows a WebSocket++ server to respond
+     * to regular HTTP requests on the same port as it processes WebSocket
+     * connections. This can be useful for hosting error messages, flash
+     * policy files, status pages, and other simple HTTP responses. It is not
+     * intended to be used as a primary web server.
+     *
+     * @param h The new http_handler
+     */
+    void set_http_handler(http_handler h) {
+        m_http_handler = h;
+    }
+
+    /// Set validate handler
+    /**
+     * The validate handler is called after a WebSocket handshake has been
+     * parsed but before a response is returned. It provides the application
+     * a chance to examine the request and determine whether or not it wants
+     * to accept the connection.
+     *
+     * Returning false from the validate handler will reject the connection.
+     * If no validate handler is present, all connections will be allowed.
+     *
+     * @param h The new validate_handler
+     */
+    void set_validate_handler(validate_handler h) {
+        m_validate_handler = h;
+    }
+
+    /// Set message handler
+    /**
+     * The message handler is called after a new message has been received.
+     *
+     * @param h The new message_handler
+     */
+    void set_message_handler(message_handler h) {
+        m_message_handler = h;
+    }
+
+    //////////////////////////////////////////
+    // Connection timeouts and other limits //
+    //////////////////////////////////////////
+
+    /// Set open handshake timeout
+    /**
+     * Sets the length of time the library will wait after an opening handshake
+     * has been initiated before cancelling it. This can be used to prevent
+     * excessive wait times for outgoing clients or excessive resource usage
+     * from broken clients or DoS attacks on servers.
+     *
+     * Connections that time out will have their fail handlers called with the
+     * open_handshake_timeout error code.
+     *
+     * The default value is specified via the compile time config value
+     * 'timeout_open_handshake'. The default value in the core config
+     * is 5000ms. A value of 0 will disable the timer entirely.
+     *
+     * To be effective, the transport you are using must support timers. See
+     * the documentation for your transport policy for details about its
+     * timer support.
+     *
+     * @param dur The length of the open handshake timeout in ms
+     */
+    void set_open_handshake_timeout(long dur) {
+        m_open_handshake_timeout_dur = dur;
+    }
+
+    /// Set close handshake timeout
+    /**
+     * Sets the length of time the library will wait after a closing handshake
+     * has been initiated before cancelling it. This can be used to prevent
+     * excessive wait times for outgoing clients or excessive resource usage
+     * from broken clients or DoS attacks on servers.
+     *
+     * Connections that time out will have their close handlers called with the
+     * close_handshake_timeout error code.
+     *
+     * The default value is specified via the compile time config value
+     * 'timeout_close_handshake'. The default value in the core config
+     * is 5000ms. A value of 0 will disable the timer entirely.
+     *
+     * To be effective, the transport you are using must support timers. See
+     * the documentation for your transport policy for details about its
+     * timer support.
+     *
+     * @param dur The length of the close handshake timeout in ms
+     */
+    void set_close_handshake_timeout(long dur) {
+        m_close_handshake_timeout_dur = dur;
+    }
+
+    /// Set pong timeout
+    /**
+     * Sets the length of time the library will wait for a pong response to a
+     * ping. This can be used as a keepalive or to detect broken  connections.
+     *
+     * Pong responses that time out will have the pong timeout handler called.
+     *
+     * The default value is specified via the compile time config value
+     * 'timeout_pong'. The default value in the core config
+     * is 5000ms. A value of 0 will disable the timer entirely.
+     *
+     * To be effective, the transport you are using must support timers. See
+     * the documentation for your transport policy for details about its
+     * timer support.
+     *
+     * @param dur The length of the pong timeout in ms
+     */
+    void set_pong_timeout(long dur) {
+        m_pong_timeout_dur = dur;
+    }
+
+    /// Get maximum message size
+    /**
+     * Get maximum message size. Maximum message size determines the point at 
+     * which the connection will fail with the message_too_big protocol error.
+     *
+     * The default is set by the endpoint that creates the connection.
+     *
+     * @since 0.3.0
+     */
+    size_t get_max_message_size() const {
+        return m_max_message_size;
+    }
+    
+    /// Set maximum message size
+    /**
+     * Set maximum message size. Maximum message size determines the point at 
+     * which the connection will fail with the message_too_big protocol error. 
+     * This value may be changed during the connection.
+     *
+     * The default is set by the endpoint that creates the connection.
+     *
+     * @since 0.3.0
+     *
+     * @param new_value The value to set as the maximum message size.
+     */
+    void set_max_message_size(size_t new_value) {
+        m_max_message_size = new_value;
+        if (m_processor) {
+            m_processor->set_max_message_size(new_value);
+        }
+    }
+    
+    /// Get maximum HTTP message body size
+    /**
+     * Get maximum HTTP message body size. Maximum message body size determines
+     * the point at which the connection will stop reading an HTTP request whose
+     * body is too large.
+     *
+     * The default is set by the endpoint that creates the connection.
+     *
+     * @since 0.5.0
+     *
+     * @return The maximum HTTP message body size
+     */
+    size_t get_max_http_body_size() const {
+        return m_request.get_max_body_size();
+    }
+    
+    /// Set maximum HTTP message body size
+    /**
+     * Set maximum HTTP message body size. Maximum message body size determines
+     * the point at which the connection will stop reading an HTTP request whose
+     * body is too large.
+     *
+     * The default is set by the endpoint that creates the connection.
+     *
+     * @since 0.5.0
+     *
+     * @param new_value The value to set as the maximum message size.
+     */
+    void set_max_http_body_size(size_t new_value) {
+        m_request.set_max_body_size(new_value);
+    }
+
+    //////////////////////////////////
+    // Uncategorized public methods //
+    //////////////////////////////////
+
+    /// Get the size of the outgoing write buffer (in payload bytes)
+    /**
+     * Retrieves the number of bytes in the outgoing write buffer that have not
+     * already been dispatched to the transport layer. This represents the bytes
+     * that are presently cancelable without uncleanly ending the websocket
+     * connection
+     *
+     * This method invokes the m_write_lock mutex
+     *
+     * @return The current number of bytes in the outgoing send buffer.
+     */
+    size_t get_buffered_amount() const;
+
+    /// Get the size of the outgoing write buffer (in payload bytes)
+    /**
+     * @deprecated use `get_buffered_amount` instead
+     */
+    size_t buffered_amount() const {
+        return get_buffered_amount();
+    }
+
+    ////////////////////
+    // Action Methods //
+    ////////////////////
+
+    /// Create a message and then add it to the outgoing send queue
+    /**
+     * Convenience method to send a message given a payload string and
+     * optionally an opcode. Default opcode is utf8 text.
+     *
+     * This method locks the m_write_lock mutex
+     *
+     * @param payload The payload string to generated the message with
+     *
+     * @param op The opcode to generated the message with. Default is
+     * frame::opcode::text
+     */
+    lib::error_code send(std::string const & payload, frame::opcode::value op =
+        frame::opcode::text);
+
+    /// Send a message (raw array overload)
+    /**
+     * Convenience method to send a message given a raw array and optionally an
+     * opcode. Default opcode is binary.
+     *
+     * This method locks the m_write_lock mutex
+     *
+     * @param payload A pointer to the array containing the bytes to send.
+     *
+     * @param len Length of the array.
+     *
+     * @param op The opcode to generated the message with. Default is
+     * frame::opcode::binary
+     */
+    lib::error_code send(void const * payload, size_t len, frame::opcode::value
+        op = frame::opcode::binary);
+
+    /// Add a message to the outgoing send queue
+    /**
+     * If presented with a prepared message it is added without validation or
+     * framing. If presented with an unprepared message it is validated, framed,
+     * and then added
+     *
+     * Errors are returned via an exception
+     * \todo make exception system_error rather than error_code
+     *
+     * This method invokes the m_write_lock mutex
+     *
+     * @param msg A message_ptr to the message to send.
+     */
+    lib::error_code send(message_ptr msg);
+
+    /// Asyncronously invoke handler::on_inturrupt
+    /**
+     * Signals to the connection to asyncronously invoke the on_inturrupt
+     * callback for this connection's handler once it is safe to do so.
+     *
+     * When the on_inturrupt handler callback is called it will be from
+     * within the transport event loop with all the thread safety features
+     * guaranteed by the transport to regular handlers
+     *
+     * Multiple inturrupt signals can be active at once on the same connection
+     *
+     * @return An error code
+     */
+    lib::error_code interrupt();
+    
+    /// Transport inturrupt callback
+    void handle_interrupt();
+    
+    /// Pause reading of new data
+    /**
+     * Signals to the connection to halt reading of new data. While reading is paused, 
+     * the connection will stop reading from its associated socket. In turn this will 
+     * result in TCP based flow control kicking in and slowing data flow from the remote
+     * endpoint.
+     *
+     * This is useful for applications that push new requests to a queue to be processed
+     * by another thread and need a way to signal when their request queue is full without
+     * blocking the network processing thread.
+     *
+     * Use `resume_reading()` to resume.
+     *
+     * If supported by the transport this is done asynchronously. As such reading may not
+     * stop until the current read operation completes. Typically you can expect to
+     * receive no more bytes after initiating a read pause than the size of the read 
+     * buffer.
+     *
+     * If reading is paused for this connection already nothing is changed.
+     */
+    lib::error_code pause_reading();
+
+    /// Pause reading callback
+    void handle_pause_reading();
+
+    /// Resume reading of new data
+    /**
+     * Signals to the connection to resume reading of new data after it was paused by
+     * `pause_reading()`.
+     *
+     * If reading is not paused for this connection already nothing is changed.
+     */
+    lib::error_code resume_reading();
+
+    /// Resume reading callback
+    void handle_resume_reading();
+
+    /// Send a ping
+    /**
+     * Initiates a ping with the given payload/
+     *
+     * There is no feedback directly from ping except in cases of immediately
+     * detectable errors. Feedback will be provided via on_pong or
+     * on_pong_timeout callbacks.
+     *
+     * Ping locks the m_write_lock mutex
+     *
+     * @param payload Payload to be used for the ping
+     */
+    void ping(std::string const & payload);
+
+    /// exception free variant of ping
+    void ping(std::string const & payload, lib::error_code & ec);
+
+    /// Utility method that gets called back when the ping timer expires
+    void handle_pong_timeout(std::string payload, lib::error_code const & ec);
+
+    /// Send a pong
+    /**
+     * Initiates a pong with the given payload.
+     *
+     * There is no feedback from a pong once sent.
+     *
+     * Pong locks the m_write_lock mutex
+     *
+     * @param payload Payload to be used for the pong
+     */
+    void pong(std::string const & payload);
+
+    /// exception free variant of pong
+    void pong(std::string const & payload, lib::error_code & ec);
+
+    /// Close the connection
+    /**
+     * Initiates the close handshake process.
+     *
+     * If close returns successfully the connection will be in the closing
+     * state and no additional messages may be sent. All messages sent prior
+     * to calling close will be written out before the connection is closed.
+     *
+     * If no reason is specified none will be sent. If no code is specified
+     * then no code will be sent.
+     *
+     * The handler's on_close callback will be called once the close handshake
+     * is complete.
+     *
+     * Reasons will be automatically truncated to the maximum length (123 bytes)
+     * if necessary.
+     *
+     * @param code The close code to send
+     * @param reason The close reason to send
+     */
+    void close(close::status::value const code, std::string const & reason);
+
+    /// exception free variant of close
+    void close(close::status::value const code, std::string const & reason,
+        lib::error_code & ec);
+
+    ////////////////////////////////////////////////
+    // Pass-through access to the uri information //
+    ////////////////////////////////////////////////
+
+    /// Returns the secure flag from the connection URI
+    /**
+     * This value is available after the HTTP request has been fully read and
+     * may be called from any thread.
+     *
+     * @return Whether or not the connection URI is flagged secure.
+     */
+    bool get_secure() const;
+
+    /// Returns the host component of the connection URI
+    /**
+     * This value is available after the HTTP request has been fully read and
+     * may be called from any thread.
+     *
+     * @return The host component of the connection URI
+     */
+    std::string const & get_host() const;
+
+    /// Returns the resource component of the connection URI
+    /**
+     * This value is available after the HTTP request has been fully read and
+     * may be called from any thread.
+     *
+     * @return The resource component of the connection URI
+     */
+    std::string const & get_resource() const;
+
+    /// Returns the port component of the connection URI
+    /**
+     * This value is available after the HTTP request has been fully read and
+     * may be called from any thread.
+     *
+     * @return The port component of the connection URI
+     */
+    uint16_t get_port() const;
+
+    /// Gets the connection URI
+    /**
+     * This should really only be called by internal library methods unless you
+     * really know what you are doing.
+     *
+     * @return A pointer to the connection's URI
+     */
+    uri_ptr get_uri() const;
+
+    /// Sets the connection URI
+    /**
+     * This should really only be called by internal library methods unless you
+     * really know what you are doing.
+     *
+     * @param uri The new URI to set
+     */
+    void set_uri(uri_ptr uri);
+
+    /////////////////////////////
+    // Subprotocol negotiation //
+    /////////////////////////////
+
+    /// Gets the negotated subprotocol
+    /**
+     * Retrieves the subprotocol that was negotiated during the handshake. This
+     * method is valid in the open handler and later.
+     *
+     * @return The negotiated subprotocol
+     */
+    std::string const & get_subprotocol() const;
+
+    /// Gets all of the subprotocols requested by the client
+    /**
+     * Retrieves the subprotocols that were requested during the handshake. This
+     * method is valid in the validate handler and later.
+     *
+     * @return A vector of the requested subprotocol
+     */
+    std::vector<std::string> const & get_requested_subprotocols() const;
+
+    /// Adds the given subprotocol string to the request list (exception free)
+    /**
+     * Adds a subprotocol to the list to send with the opening handshake. This
+     * may be called multiple times to request more than one. If the server
+     * supports one of these, it may choose one. If so, it will return it
+     * in it's handshake reponse and the value will be available via
+     * get_subprotocol(). Subprotocol requests should be added in order of
+     * preference.
+     *
+     * @param request The subprotocol to request
+     * @param ec A reference to an error code that will be filled in the case of
+     * errors
+     */
+    void add_subprotocol(std::string const & request, lib::error_code & ec);
+
+    /// Adds the given subprotocol string to the request list
+    /**
+     * Adds a subprotocol to the list to send with the opening handshake. This
+     * may be called multiple times to request more than one. If the server
+     * supports one of these, it may choose one. If so, it will return it
+     * in it's handshake reponse and the value will be available via
+     * get_subprotocol(). Subprotocol requests should be added in order of
+     * preference.
+     *
+     * @param request The subprotocol to request
+     */
+    void add_subprotocol(std::string const & request);
+
+    /// Select a subprotocol to use (exception free)
+    /**
+     * Indicates which subprotocol should be used for this connection. Valid
+     * only during the validate handler callback. Subprotocol selected must have
+     * been requested by the client. Consult get_requested_subprotocols() for a
+     * list of valid subprotocols.
+     *
+     * This member function is valid on server endpoints/connections only
+     *
+     * @param value The subprotocol to select
+     * @param ec A reference to an error code that will be filled in the case of
+     * errors
+     */
+    void select_subprotocol(std::string const & value, lib::error_code & ec);
+
+    /// Select a subprotocol to use
+    /**
+     * Indicates which subprotocol should be used for this connection. Valid
+     * only during the validate handler callback. Subprotocol selected must have
+     * been requested by the client. Consult get_requested_subprotocols() for a
+     * list of valid subprotocols.
+     *
+     * This member function is valid on server endpoints/connections only
+     *
+     * @param value The subprotocol to select
+     */
+    void select_subprotocol(std::string const & value);
+
+    /////////////////////////////////////////////////////////////
+    // Pass-through access to the request and response objects //
+    /////////////////////////////////////////////////////////////
+
+    /// Retrieve a request header
+    /**
+     * Retrieve the value of a header from the handshake HTTP request.
+     *
+     * @param key Name of the header to get
+     * @return The value of the header
+     */
+    std::string const & get_request_header(std::string const & key) const;
+
+    /// Retrieve a request body
+    /**
+     * Retrieve the value of the request body. This value is typically used with
+     * PUT and POST requests to upload files or other data. Only HTTP
+     * connections will ever have bodies. WebSocket connection's will always
+     * have blank bodies.
+     *
+     * @return The value of the request body.
+     */
+    std::string const & get_request_body() const;
+
+    /// Retrieve a response header
+    /**
+     * Retrieve the value of a header from the handshake HTTP request.
+     *
+     * @param key Name of the header to get
+     * @return The value of the header
+     */
+    std::string const & get_response_header(std::string const & key) const;
+
+    /// Get response HTTP status code
+    /**
+     * Gets the response status code 
+     *
+     * @since 0.7.0
+     *
+     * @return The response status code sent
+     */
+    http::status_code::value get_response_code() const {
+        return m_response.get_status_code();
+    }
+
+    /// Get response HTTP status message
+    /**
+     * Gets the response status message 
+     *
+     * @since 0.7.0
+     *
+     * @return The response status message sent
+     */
+    std::string const & get_response_msg() const {
+        return m_response.get_status_msg();
+    }
+    
+    /// Set response status code and message
+    /**
+     * Sets the response status code to `code` and looks up the corresponding
+     * message for standard codes. Non-standard codes will be entered as Unknown
+     * use set_status(status_code::value,std::string) overload to set both
+     * values explicitly.
+     *
+     * This member function is valid only from the http() and validate() handler
+     * callbacks.
+     *
+     * @param code Code to set
+     * @param msg Message to set
+     * @see websocketpp::http::response::set_status
+     */
+    void set_status(http::status_code::value code);
+
+    /// Set response status code and message
+    /**
+     * Sets the response status code and message to independent custom values.
+     * use set_status(status_code::value) to set the code and have the standard
+     * message be automatically set.
+     *
+     * This member function is valid only from the http() and validate() handler
+     * callbacks.
+     *
+     * @param code Code to set
+     * @param msg Message to set
+     * @see websocketpp::http::response::set_status
+     */
+    void set_status(http::status_code::value code, std::string const & msg);
+
+    /// Set response body content
+    /**
+     * Set the body content of the HTTP response to the parameter string. Note
+     * set_body will also set the Content-Length HTTP header to the appropriate
+     * value. If you want the Content-Length header to be something else set it
+     * to something else after calling set_body
+     *
+     * This member function is valid only from the http() and validate() handler
+     * callbacks.
+     *
+     * @param value String data to include as the body content.
+     * @see websocketpp::http::response::set_body
+     */
+    void set_body(std::string const & value);
+
+    /// Append a header
+    /**
+     * If a header with this name already exists the value will be appended to
+     * the existing header to form a comma separated list of values. Use
+     * `connection::replace_header` to overwrite existing values.
+     *
+     * This member function is valid only from the http() and validate() handler
+     * callbacks, or to a client connection before connect has been called.
+     *
+     * @param key Name of the header to set
+     * @param val Value to add
+     * @see replace_header
+     * @see websocketpp::http::parser::append_header
+     */
+    void append_header(std::string const & key, std::string const & val);
+
+    /// Replace a header
+    /**
+     * If a header with this name already exists the old value will be replaced
+     * Use `connection::append_header` to append to a list of existing values.
+     *
+     * This member function is valid only from the http() and validate() handler
+     * callbacks, or to a client connection before connect has been called.
+     *
+     * @param key Name of the header to set
+     * @param val Value to set
+     * @see append_header
+     * @see websocketpp::http::parser::replace_header
+     */
+    void replace_header(std::string const & key, std::string const & val);
+
+    /// Remove a header
+    /**
+     * Removes a header from the response.
+     *
+     * This member function is valid only from the http() and validate() handler
+     * callbacks, or to a client connection before connect has been called.
+     *
+     * @param key The name of the header to remove
+     * @see websocketpp::http::parser::remove_header
+     */
+    void remove_header(std::string const & key);
+
+    /// Get request object
+    /**
+     * Direct access to request object. This can be used to call methods of the
+     * request object that are not part of the standard request API that
+     * connection wraps.
+     *
+     * Note use of this method involves using behavior specific to the
+     * configured HTTP policy. Such behavior may not work with alternate HTTP
+     * policies.
+     *
+     * @since 0.3.0-alpha3
+     *
+     * @return A const reference to the raw request object
+     */
+    request_type const & get_request() const {
+        return m_request;
+    }
+    
+    /// Get response object
+    /**
+     * Direct access to the HTTP response sent or received as a part of the
+     * opening handshake. This can be used to call methods of the response
+     * object that are not part of the standard request API that connection
+     * wraps.
+     *
+     * Note use of this method involves using behavior specific to the
+     * configured HTTP policy. Such behavior may not work with alternate HTTP
+     * policies.
+     *
+     * @since 0.7.0
+     *
+     * @return A const reference to the raw response object
+     */
+    response_type const & get_response() const {
+        return m_response;
+    }
+    
+    /// Defer HTTP Response until later (Exception free)
+    /**
+     * Used in the http handler to defer the HTTP response for this connection
+     * until later. Handshake timers will be canceled and the connection will be
+     * left open until `send_http_response` or an equivalent is called.
+     *
+     * Warning: deferred connections won't time out and as a result can tie up
+     * resources.
+     *
+     * @since 0.6.0
+     *
+     * @return A status code, zero on success, non-zero otherwise
+     */
+    lib::error_code defer_http_response();
+    
+    /// Send deferred HTTP Response (exception free)
+    /**
+     * Sends an http response to an HTTP connection that was deferred. This will
+     * send a complete response including all headers, status line, and body
+     * text. The connection will be closed afterwards.
+     *
+     * @since 0.6.0
+     *
+     * @param ec A status code, zero on success, non-zero otherwise
+     */
+    void send_http_response(lib::error_code & ec);
+    
+    /// Send deferred HTTP Response
+    void send_http_response();
+    
+    // TODO HTTPNBIO: write_headers
+    // function that processes headers + status so far and writes it to the wire
+    // beginning the HTTP response body state. This method will ignore anything
+    // in the response body.
+    
+    // TODO HTTPNBIO: write_body_message
+    // queues the specified message_buffer for async writing
+    
+    // TODO HTTPNBIO: finish connection
+    //
+    
+    // TODO HTTPNBIO: write_response
+    // Writes the whole response, headers + body and closes the connection
+    
+    
+
+    /////////////////////////////////////////////////////////////
+    // Pass-through access to the other connection information //
+    /////////////////////////////////////////////////////////////
+
+    /// Get Connection Handle
+    /**
+     * The connection handle is a token that can be shared outside the
+     * WebSocket++ core for the purposes of identifying a connection and
+     * sending it messages.
+     *
+     * @return A handle to the connection
+     */
+    connection_hdl get_handle() const {
+        return m_connection_hdl;
+    }
+
+    /// Get whether or not this connection is part of a server or client
+    /**
+     * @return whether or not the connection is attached to a server endpoint
+     */
+    bool is_server() const {
+        return m_is_server;
+    }
+
+    /// Return the same origin policy origin value from the opening request.
+    /**
+     * This value is available after the HTTP request has been fully read and
+     * may be called from any thread.
+     *
+     * @return The connection's origin value from the opening handshake.
+     */
+    std::string const & get_origin() const;
+
+    /// Return the connection state.
+    /**
+     * Values can be connecting, open, closing, and closed
+     *
+     * @return The connection's current state.
+     */
+    session::state::value get_state() const;
+
+
+    /// Get the WebSocket close code sent by this endpoint.
+    /**
+     * @return The WebSocket close code sent by this endpoint.
+     */
+    close::status::value get_local_close_code() const {
+        return m_local_close_code;
+    }
+
+    /// Get the WebSocket close reason sent by this endpoint.
+    /**
+     * @return The WebSocket close reason sent by this endpoint.
+     */
+    std::string const & get_local_close_reason() const {
+        return m_local_close_reason;
+    }
+
+    /// Get the WebSocket close code sent by the remote endpoint.
+    /**
+     * @return The WebSocket close code sent by the remote endpoint.
+     */
+    close::status::value get_remote_close_code() const {
+        return m_remote_close_code;
+    }
+
+    /// Get the WebSocket close reason sent by the remote endpoint.
+    /**
+     * @return The WebSocket close reason sent by the remote endpoint.
+     */
+    std::string const & get_remote_close_reason() const {
+        return m_remote_close_reason;
+    }
+
+    /// Get the internal error code for a closed/failed connection
+    /**
+     * Retrieves a machine readable detailed error code indicating the reason
+     * that the connection was closed or failed. Valid only after the close or
+     * fail handler is called.
+     *
+     * @return Error code indicating the reason the connection was closed or
+     * failed
+     */
+    lib::error_code get_ec() const {
+        return m_ec;
+    }
+
+    /// Get a message buffer
+    /**
+     * Warning: The API related to directly sending message buffers may change
+     * before the 1.0 release. If you plan to use it, please keep an eye on any
+     * breaking changes notifications in future release notes. Also if you have
+     * any feedback about usage and capabilities now is a great time to provide
+     * it.
+     *
+     * Message buffers are used to store message payloads and other message
+     * metadata.
+     *
+     * The size parameter is a hint only. Your final payload does not need to
+     * match it. There may be some performance benefits if the initial size
+     * guess is equal to or slightly higher than the final payload size.
+     *
+     * @param op The opcode for the new message
+     * @param size A hint to optimize the initial allocation of payload space.
+     * @return A new message buffer
+     */
+    message_ptr get_message(websocketpp::frame::opcode::value op, size_t size)
+        const
+    {
+        return m_msg_manager->get_message(op, size);
+    }
+
+    ////////////////////////////////////////////////////////////////////////
+    // The remaining public member functions are for internal/policy use  //
+    // only. Do not call from application code unless you understand what //
+    // you are doing.                                                     //
+    ////////////////////////////////////////////////////////////////////////
+
+    
+
+    void read_handshake(size_t num_bytes);
+
+    void handle_read_handshake(lib::error_code const & ec,
+        size_t bytes_transferred);
+    void handle_read_http_response(lib::error_code const & ec,
+        size_t bytes_transferred);
+
+    
+    void handle_write_http_response(lib::error_code const & ec);
+    void handle_send_http_request(lib::error_code const & ec);
+
+    void handle_open_handshake_timeout(lib::error_code const & ec);
+    void handle_close_handshake_timeout(lib::error_code const & ec);
+
+    void handle_read_frame(lib::error_code const & ec, size_t bytes_transferred);
+    void read_frame();
+
+    /// Get array of WebSocket protocol versions that this connection supports.
+    std::vector<int> const & get_supported_versions() const;
+
+    /// Sets the handler for a terminating connection. Should only be used
+    /// internally by the endpoint class.
+    void set_termination_handler(termination_handler new_handler);
+
+    void terminate(lib::error_code const & ec);
+    void handle_terminate(terminate_status tstat, lib::error_code const & ec);
+
+    /// Checks if there are frames in the send queue and if there are sends one
+    /**
+     * \todo unit tests
+     *
+     * This method locks the m_write_lock mutex
+     */
+    void write_frame();
+
+    /// Process the results of a frame write operation and start the next write
+    /**
+     * \todo unit tests
+     *
+     * This method locks the m_write_lock mutex
+     *
+     * @param terminate Whether or not to terminate the connection upon
+     * completion of this write.
+     *
+     * @param ec A status code from the transport layer, zero on success,
+     * non-zero otherwise.
+     */
+    void handle_write_frame(lib::error_code const & ec);
+// protected:
+    // This set of methods would really like to be protected, but doing so 
+    // requires that the endpoint be able to friend the connection. This is 
+    // allowed with C++11, but not prior versions
+
+    /// Start the connection state machine
+    void start();
+
+    /// Set Connection Handle
+    /**
+     * The connection handle is a token that can be shared outside the
+     * WebSocket++ core for the purposes of identifying a connection and
+     * sending it messages.
+     *
+     * @param hdl A connection_hdl that the connection will use to refer
+     * to itself.
+     */
+    void set_handle(connection_hdl hdl) {
+        m_connection_hdl = hdl;
+        transport_con_type::set_handle(hdl);
+    }
+protected:
+    void handle_transport_init(lib::error_code const & ec);
+
+    /// Set m_processor based on information in m_request. Set m_response
+    /// status and return an error code indicating status.
+    lib::error_code initialize_processor();
+
+    /// Perform WebSocket handshake validation of m_request using m_processor.
+    /// set m_response and return an error code indicating status.
+    lib::error_code process_handshake_request();
+private:
+    
+
+    /// Completes m_response, serializes it, and sends it out on the wire.
+    void write_http_response(lib::error_code const & ec);
+
+    /// Sends an opening WebSocket connect request
+    void send_http_request();
+
+    /// Alternate path for write_http_response in error conditions
+    void write_http_response_error(lib::error_code const & ec);
+
+    /// Process control message
+    /**
+     *
+     */
+    void process_control_frame(message_ptr msg);
+
+    /// Send close acknowledgement
+    /**
+     * If no arguments are present no close code/reason will be specified.
+     *
+     * Note: the close code/reason values provided here may be overrided by
+     * other settings (such as silent close).
+     *
+     * @param code The close code to send
+     * @param reason The close reason to send
+     * @return A status code, zero on success, non-zero otherwise
+     */
+    lib::error_code send_close_ack(close::status::value code =
+        close::status::blank, std::string const & reason = std::string());
+
+    /// Send close frame
+    /**
+     * If no arguments are present no close code/reason will be specified.
+     *
+     * Note: the close code/reason values provided here may be overrided by
+     * other settings (such as silent close).
+     *
+     * The ack flag determines what to do in the case of a blank status and
+     * whether or not to terminate the TCP connection after sending it.
+     *
+     * @param code The close code to send
+     * @param reason The close reason to send
+     * @param ack Whether or not this is an acknowledgement close frame
+     * @return A status code, zero on success, non-zero otherwise
+     */
+    lib::error_code send_close_frame(close::status::value code =
+        close::status::blank, std::string const & reason = std::string(), bool ack = false,
+        bool terminal = false);
+
+    /// Get a pointer to a new WebSocket protocol processor for a given version
+    /**
+     * @param version Version number of the WebSocket protocol to get a
+     * processor for. Negative values indicate invalid/unknown versions and will
+     * always return a null ptr
+     *
+     * @return A shared_ptr to a new instance of the appropriate processor or a
+     * null ptr if there is no installed processor that matches the version
+     * number.
+     */
+    processor_ptr get_processor(int version) const;
+
+    /// Add a message to the write queue
+    /**
+     * Adds a message to the write queue and updates any associated shared state
+     *
+     * Must be called while holding m_write_lock
+     *
+     * @todo unit tests
+     *
+     * @param msg The message to push
+     */
+    void write_push(message_ptr msg);
+
+    /// Pop a message from the write queue
+    /**
+     * Removes and returns a message from the write queue and updates any
+     * associated shared state.
+     *
+     * Must be called while holding m_write_lock
+     *
+     * @todo unit tests
+     *
+     * @return the message_ptr at the front of the queue
+     */
+    message_ptr write_pop();
+
+    /// Prints information about the incoming connection to the access log
+    /**
+     * Prints information about the incoming connection to the access log.
+     * Includes: connection type, websocket version, remote endpoint, user agent
+     * path, status code.
+     */
+    void log_open_result();
+
+    /// Prints information about a connection being closed to the access log
+    /**
+     * Includes: local and remote close codes and reasons
+     */
+    void log_close_result();
+
+    /// Prints information about a connection being failed to the access log
+    /**
+     * Includes: error code and message for why it was failed
+     */
+    void log_fail_result();
+    
+    /// Prints information about HTTP connections
+    /**
+     * Includes: TODO
+     */
+    void log_http_result();
+
+    /// Prints information about an arbitrary error code on the specified channel
+    template <typename error_type>
+    void log_err(log::level l, char const * msg, error_type const & ec) {
+        std::stringstream s;
+        s << msg << " error: " << ec << " (" << ec.message() << ")";
+        m_elog.write(l, s.str());
+    }
+
+    // internal handler functions
+    read_handler            m_handle_read_frame;
+    write_frame_handler     m_write_frame_handler;
+
+    // static settings
+    std::string const       m_user_agent;
+
+    /// Pointer to the connection handle
+    connection_hdl          m_connection_hdl;
+
+    /// Handler objects
+    open_handler            m_open_handler;
+    close_handler           m_close_handler;
+    fail_handler            m_fail_handler;
+    ping_handler            m_ping_handler;
+    pong_handler            m_pong_handler;
+    pong_timeout_handler    m_pong_timeout_handler;
+    interrupt_handler       m_interrupt_handler;
+    http_handler            m_http_handler;
+    validate_handler        m_validate_handler;
+    message_handler         m_message_handler;
+
+    /// constant values
+    long                    m_open_handshake_timeout_dur;
+    long                    m_close_handshake_timeout_dur;
+    long                    m_pong_timeout_dur;
+    size_t                  m_max_message_size;
+
+    /// External connection state
+    /**
+     * Lock: m_connection_state_lock
+     */
+    session::state::value   m_state;
+
+    /// Internal connection state
+    /**
+     * Lock: m_connection_state_lock
+     */
+    istate_type             m_internal_state;
+
+    mutable mutex_type      m_connection_state_lock;
+
+    /// The lock used to protect the message queue
+    /**
+     * Serializes access to the write queue as well as shared state within the
+     * processor.
+     */
+    mutex_type              m_write_lock;
+
+    // connection resources
+    char                    m_buf[config::connection_read_buffer_size];
+    size_t                  m_buf_cursor;
+    termination_handler     m_termination_handler;
+    con_msg_manager_ptr     m_msg_manager;
+    timer_ptr               m_handshake_timer;
+    timer_ptr               m_ping_timer;
+
+    /// @todo this is not memory efficient. this value is not used after the
+    /// handshake.
+    std::string m_handshake_buffer;
+
+    /// Pointer to the processor object for this connection
+    /**
+     * The processor provides functionality that is specific to the WebSocket
+     * protocol version that the client has negotiated. It also contains all of
+     * the state necessary to encode and decode the incoming and outgoing
+     * WebSocket byte streams
+     *
+     * Use of the prepare_data_frame method requires lock: m_write_lock
+     */
+    processor_ptr           m_processor;
+
+    /// Queue of unsent outgoing messages
+    /**
+     * Lock: m_write_lock
+     */
+    std::queue<message_ptr> m_send_queue;
+
+    /// Size in bytes of the outstanding payloads in the write queue
+    /**
+     * Lock: m_write_lock
+     */
+    size_t m_send_buffer_size;
+
+    /// buffer holding the various parts of the current message being writen
+    /**
+     * Lock m_write_lock
+     */
+    std::vector<transport::buffer> m_send_buffer;
+
+    /// a list of pointers to hold on to the messages being written to keep them
+    /// from going out of scope before the write is complete.
+    std::vector<message_ptr> m_current_msgs;
+
+    /// True if there is currently an outstanding transport write
+    /**
+     * Lock m_write_lock
+     */
+    bool m_write_flag;
+
+    /// True if this connection is presently reading new data
+    bool m_read_flag;
+
+    // connection data
+    request_type            m_request;
+    response_type           m_response;
+    uri_ptr                 m_uri;
+    std::string             m_subprotocol;
+
+    // connection data that might not be necessary to keep around for the life
+    // of the whole connection.
+    std::vector<std::string> m_requested_subprotocols;
+
+    bool const              m_is_server;
+    alog_type& m_alog;
+    elog_type& m_elog;
+
+    rng_type & m_rng;
+
+    // Close state
+    /// Close code that was sent on the wire by this endpoint
+    close::status::value    m_local_close_code;
+
+    /// Close reason that was sent on the wire by this endpoint
+    std::string             m_local_close_reason;
+
+    /// Close code that was received on the wire from the remote endpoint
+    close::status::value    m_remote_close_code;
+
+    /// Close reason that was received on the wire from the remote endpoint
+    std::string             m_remote_close_reason;
+
+    /// Detailed internal error code
+    lib::error_code m_ec;
+    
+    /// A flag that gets set once it is determined that the connection is an
+    /// HTTP connection and not a WebSocket one.
+    bool m_is_http;
+    
+    /// A flag that gets set when the completion of an http connection is
+    /// deferred until later.
+    session::http_state::value m_http_state;
+
+    bool m_was_clean;
+
+    /// Whether or not this endpoint initiated the closing handshake.
+    bool                    m_closed_by_me;
+
+    /// ???
+    bool                    m_failed_by_me;
+
+    /// Whether or not this endpoint initiated the drop of the TCP connection
+    bool                    m_dropped_by_me;
+};
+
+} // namespace websocketpp
+
+#include <websocketpp/impl/connection_impl.hpp>
+
+#endif // WEBSOCKETPP_CONNECTION_HPP
diff --git a/vendor/websocketpp/websocketpp/connection_base.hpp b/vendor/websocketpp/websocketpp/connection_base.hpp
new file mode 100644
index 0000000..2e70096
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/connection_base.hpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONNECTION_BASE_HPP
+#define WEBSOCKETPP_CONNECTION_BASE_HPP
+
+namespace websocketpp {
+
+/// Stub for user supplied base class.
+class connection_base {};
+
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONNECTION_BASE_HPP
diff --git a/vendor/websocketpp/websocketpp/endpoint.hpp b/vendor/websocketpp/websocketpp/endpoint.hpp
new file mode 100644
index 0000000..65584d8
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/endpoint.hpp
@@ -0,0 +1,700 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_ENDPOINT_HPP
+#define WEBSOCKETPP_ENDPOINT_HPP
+
+#include <websocketpp/connection.hpp>
+
+#include <websocketpp/logger/levels.hpp>
+#include <websocketpp/version.hpp>
+
+#include <string>
+
+namespace websocketpp {
+
+/// Creates and manages connections associated with a WebSocket endpoint
+template <typename connection, typename config>
+class endpoint : public config::transport_type, public config::endpoint_base {
+public:
+    // Import appropriate types from our helper class
+    // See endpoint_types for more details.
+    typedef endpoint<connection,config> type;
+
+    /// Type of the transport component of this endpoint
+    typedef typename config::transport_type transport_type;
+    /// Type of the concurrency component of this endpoint
+    typedef typename config::concurrency_type concurrency_type;
+
+    /// Type of the connections that this endpoint creates
+    typedef connection connection_type;
+    /// Shared pointer to connection_type
+    typedef typename connection_type::ptr connection_ptr;
+    /// Weak pointer to connection type
+    typedef typename connection_type::weak_ptr connection_weak_ptr;
+
+    /// Type of the transport component of the connections that this endpoint
+    /// creates
+    typedef typename transport_type::transport_con_type transport_con_type;
+    /// Type of a shared pointer to the transport component of the connections
+    /// that this endpoint creates.
+    typedef typename transport_con_type::ptr transport_con_ptr;
+
+    /// Type of message_handler
+    typedef typename connection_type::message_handler message_handler;
+    /// Type of message pointers that this endpoint uses
+    typedef typename connection_type::message_ptr message_ptr;
+
+    /// Type of error logger
+    typedef typename config::elog_type elog_type;
+    /// Type of access logger
+    typedef typename config::alog_type alog_type;
+
+    /// Type of our concurrency policy's scoped lock object
+    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
+    /// Type of our concurrency policy's mutex object
+    typedef typename concurrency_type::mutex_type mutex_type;
+
+    /// Type of RNG
+    typedef typename config::rng_type rng_type;
+
+    // TODO: organize these
+    typedef typename connection_type::termination_handler termination_handler;
+
+    // This would be ideal. Requires C++11 though
+    //friend connection;
+
+    explicit endpoint(bool p_is_server)
+      : m_alog(config::alog_level, log::channel_type_hint::access)
+      , m_elog(config::elog_level, log::channel_type_hint::error)
+      , m_user_agent(::websocketpp::user_agent)
+      , m_open_handshake_timeout_dur(config::timeout_open_handshake)
+      , m_close_handshake_timeout_dur(config::timeout_close_handshake)
+      , m_pong_timeout_dur(config::timeout_pong)
+      , m_max_message_size(config::max_message_size)
+      , m_max_http_body_size(config::max_http_body_size)
+      , m_is_server(p_is_server)
+    {
+        m_alog.set_channels(config::alog_level);
+        m_elog.set_channels(config::elog_level);
+
+        m_alog.write(log::alevel::devel, "endpoint constructor");
+
+        transport_type::init_logging(&m_alog, &m_elog);
+    }
+
+
+    /// Destructor
+    ~endpoint<connection,config>() {}
+
+    #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+        // no copy constructor because endpoints are not copyable
+        endpoint(endpoint &) = delete;
+    
+        // no copy assignment operator because endpoints are not copyable
+        endpoint & operator=(endpoint const &) = delete;
+    #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+
+    #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+        /// Move constructor
+        endpoint(endpoint && o) 
+         : config::transport_type(std::move(o))
+         , config::endpoint_base(std::move(o))
+         , m_alog(std::move(o.m_alog))
+         , m_elog(std::move(o.m_elog))
+         , m_user_agent(std::move(o.m_user_agent))
+         , m_open_handler(std::move(o.m_open_handler))
+         
+         , m_close_handler(std::move(o.m_close_handler))
+         , m_fail_handler(std::move(o.m_fail_handler))
+         , m_ping_handler(std::move(o.m_ping_handler))
+         , m_pong_handler(std::move(o.m_pong_handler))
+         , m_pong_timeout_handler(std::move(o.m_pong_timeout_handler))
+         , m_interrupt_handler(std::move(o.m_interrupt_handler))
+         , m_http_handler(std::move(o.m_http_handler))
+         , m_validate_handler(std::move(o.m_validate_handler))
+         , m_message_handler(std::move(o.m_message_handler))
+
+         , m_open_handshake_timeout_dur(o.m_open_handshake_timeout_dur)
+         , m_close_handshake_timeout_dur(o.m_close_handshake_timeout_dur)
+         , m_pong_timeout_dur(o.m_pong_timeout_dur)
+         , m_max_message_size(o.m_max_message_size)
+         , m_max_http_body_size(o.m_max_http_body_size)
+
+         , m_rng(std::move(o.m_rng))
+         , m_is_server(o.m_is_server)         
+        {}
+
+    #ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+        // no move assignment operator because of const member variables
+        endpoint & operator=(endpoint &&) = delete;
+    #endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+
+    #endif // _WEBSOCKETPP_MOVE_SEMANTICS_
+
+
+    /// Returns the user agent string that this endpoint will use
+    /**
+     * Returns the user agent string that this endpoint will use when creating
+     * new connections.
+     *
+     * The default value for this version is stored in websocketpp::user_agent
+     *
+     * @return The user agent string.
+     */
+    std::string get_user_agent() const {
+        scoped_lock_type guard(m_mutex);
+        return m_user_agent;
+    }
+
+    /// Sets the user agent string that this endpoint will use
+    /**
+     * Sets the identifier that this endpoint will use when creating new
+     * connections. Changing this value will only affect future connections.
+     * For client endpoints this will be sent as the "User-Agent" header in
+     * outgoing requests. For server endpoints this will be sent in the "Server"
+     * response header.
+     *
+     * Setting this value to the empty string will suppress the use of the
+     * Server and User-Agent headers. This is typically done to hide
+     * implementation details for security purposes.
+     *
+     * For best results set this before accepting or opening connections.
+     *
+     * The default value for this version is stored in websocketpp::user_agent
+     *
+     * This can be overridden on an individual connection basis by setting a
+     * custom "Server" header during the validate handler or "User-Agent"
+     * header on a connection before calling connect().
+     *
+     * @param ua The string to set the user agent to.
+     */
+    void set_user_agent(std::string const & ua) {
+        scoped_lock_type guard(m_mutex);
+        m_user_agent = ua;
+    }
+
+    /// Returns whether or not this endpoint is a server.
+    /**
+     * @return Whether or not this endpoint is a server
+     */
+    bool is_server() const {
+        return m_is_server;
+    }
+
+    /********************************/
+    /* Pass-through logging adaptor */
+    /********************************/
+
+    /// Set Access logging channel
+    /**
+     * Set the access logger's channel value. The value is a number whose
+     * interpretation depends on the logging policy in use.
+     *
+     * @param channels The channel value(s) to set
+     */
+    void set_access_channels(log::level channels) {
+        m_alog.set_channels(channels);
+    }
+
+    /// Clear Access logging channels
+    /**
+     * Clear the access logger's channel value. The value is a number whose
+     * interpretation depends on the logging policy in use.
+     *
+     * @param channels The channel value(s) to clear
+     */
+    void clear_access_channels(log::level channels) {
+        m_alog.clear_channels(channels);
+    }
+
+    /// Set Error logging channel
+    /**
+     * Set the error logger's channel value. The value is a number whose
+     * interpretation depends on the logging policy in use.
+     *
+     * @param channels The channel value(s) to set
+     */
+    void set_error_channels(log::level channels) {
+        m_elog.set_channels(channels);
+    }
+
+    /// Clear Error logging channels
+    /**
+     * Clear the error logger's channel value. The value is a number whose
+     * interpretation depends on the logging policy in use.
+     *
+     * @param channels The channel value(s) to clear
+     */
+    void clear_error_channels(log::level channels) {
+        m_elog.clear_channels(channels);
+    }
+
+    /// Get reference to access logger
+    /**
+     * @return A reference to the access logger
+     */
+    alog_type & get_alog() {
+        return m_alog;
+    }
+
+    /// Get reference to error logger
+    /**
+     * @return A reference to the error logger
+     */
+    elog_type & get_elog() {
+        return m_elog;
+    }
+
+    /*************************/
+    /* Set Handler functions */
+    /*************************/
+
+    void set_open_handler(open_handler h) {
+        m_alog.write(log::alevel::devel,"set_open_handler");
+        scoped_lock_type guard(m_mutex);
+        m_open_handler = h;
+    }
+    void set_close_handler(close_handler h) {
+        m_alog.write(log::alevel::devel,"set_close_handler");
+        scoped_lock_type guard(m_mutex);
+        m_close_handler = h;
+    }
+    void set_fail_handler(fail_handler h) {
+        m_alog.write(log::alevel::devel,"set_fail_handler");
+        scoped_lock_type guard(m_mutex);
+        m_fail_handler = h;
+    }
+    void set_ping_handler(ping_handler h) {
+        m_alog.write(log::alevel::devel,"set_ping_handler");
+        scoped_lock_type guard(m_mutex);
+        m_ping_handler = h;
+    }
+    void set_pong_handler(pong_handler h) {
+        m_alog.write(log::alevel::devel,"set_pong_handler");
+        scoped_lock_type guard(m_mutex);
+        m_pong_handler = h;
+    }
+    void set_pong_timeout_handler(pong_timeout_handler h) {
+        m_alog.write(log::alevel::devel,"set_pong_timeout_handler");
+        scoped_lock_type guard(m_mutex);
+        m_pong_timeout_handler = h;
+    }
+    void set_interrupt_handler(interrupt_handler h) {
+        m_alog.write(log::alevel::devel,"set_interrupt_handler");
+        scoped_lock_type guard(m_mutex);
+        m_interrupt_handler = h;
+    }
+    void set_http_handler(http_handler h) {
+        m_alog.write(log::alevel::devel,"set_http_handler");
+        scoped_lock_type guard(m_mutex);
+        m_http_handler = h;
+    }
+    void set_validate_handler(validate_handler h) {
+        m_alog.write(log::alevel::devel,"set_validate_handler");
+        scoped_lock_type guard(m_mutex);
+        m_validate_handler = h;
+    }
+    void set_message_handler(message_handler h) {
+        m_alog.write(log::alevel::devel,"set_message_handler");
+        scoped_lock_type guard(m_mutex);
+        m_message_handler = h;
+    }
+
+    //////////////////////////////////////////
+    // Connection timeouts and other limits //
+    //////////////////////////////////////////
+
+    /// Set open handshake timeout
+    /**
+     * Sets the length of time the library will wait after an opening handshake
+     * has been initiated before cancelling it. This can be used to prevent
+     * excessive wait times for outgoing clients or excessive resource usage
+     * from broken clients or DoS attacks on servers.
+     *
+     * Connections that time out will have their fail handlers called with the
+     * open_handshake_timeout error code.
+     *
+     * The default value is specified via the compile time config value
+     * 'timeout_open_handshake'. The default value in the core config
+     * is 5000ms. A value of 0 will disable the timer entirely.
+     *
+     * To be effective, the transport you are using must support timers. See
+     * the documentation for your transport policy for details about its
+     * timer support.
+     *
+     * @param dur The length of the open handshake timeout in ms
+     */
+    void set_open_handshake_timeout(long dur) {
+        scoped_lock_type guard(m_mutex);
+        m_open_handshake_timeout_dur = dur;
+    }
+
+    /// Set close handshake timeout
+    /**
+     * Sets the length of time the library will wait after a closing handshake
+     * has been initiated before cancelling it. This can be used to prevent
+     * excessive wait times for outgoing clients or excessive resource usage
+     * from broken clients or DoS attacks on servers.
+     *
+     * Connections that time out will have their close handlers called with the
+     * close_handshake_timeout error code.
+     *
+     * The default value is specified via the compile time config value
+     * 'timeout_close_handshake'. The default value in the core config
+     * is 5000ms. A value of 0 will disable the timer entirely.
+     *
+     * To be effective, the transport you are using must support timers. See
+     * the documentation for your transport policy for details about its
+     * timer support.
+     *
+     * @param dur The length of the close handshake timeout in ms
+     */
+    void set_close_handshake_timeout(long dur) {
+        scoped_lock_type guard(m_mutex);
+        m_close_handshake_timeout_dur = dur;
+    }
+
+    /// Set pong timeout
+    /**
+     * Sets the length of time the library will wait for a pong response to a
+     * ping. This can be used as a keepalive or to detect broken  connections.
+     *
+     * Pong responses that time out will have the pong timeout handler called.
+     *
+     * The default value is specified via the compile time config value
+     * 'timeout_pong'. The default value in the core config
+     * is 5000ms. A value of 0 will disable the timer entirely.
+     *
+     * To be effective, the transport you are using must support timers. See
+     * the documentation for your transport policy for details about its
+     * timer support.
+     *
+     * @param dur The length of the pong timeout in ms
+     */
+    void set_pong_timeout(long dur) {
+        scoped_lock_type guard(m_mutex);
+        m_pong_timeout_dur = dur;
+    }
+
+    /// Get default maximum message size
+    /**
+     * Get the default maximum message size that will be used for new 
+     * connections created by this endpoint. The maximum message size determines
+     * the point at which the connection will fail a connection with the 
+     * message_too_big protocol error.
+     *
+     * The default is set by the max_message_size value from the template config
+     *
+     * @since 0.3.0
+     */
+    size_t get_max_message_size() const {
+        return m_max_message_size;
+    }
+    
+    /// Set default maximum message size
+    /**
+     * Set the default maximum message size that will be used for new 
+     * connections created by this endpoint. Maximum message size determines the
+     * point at which the connection will fail a connection with the
+     * message_too_big protocol error.
+     *
+     * The default is set by the max_message_size value from the template config
+     *
+     * @since 0.3.0
+     *
+     * @param new_value The value to set as the maximum message size.
+     */
+    void set_max_message_size(size_t new_value) {
+        m_max_message_size = new_value;
+    }
+
+    /// Get maximum HTTP message body size
+    /**
+     * Get maximum HTTP message body size. Maximum message body size determines
+     * the point at which the connection will stop reading an HTTP request whose
+     * body is too large.
+     *
+     * The default is set by the max_http_body_size value from the template
+     * config
+     *
+     * @since 0.5.0
+     *
+     * @return The maximum HTTP message body size
+     */
+    size_t get_max_http_body_size() const {
+        return m_max_http_body_size;
+    }
+    
+    /// Set maximum HTTP message body size
+    /**
+     * Set maximum HTTP message body size. Maximum message body size determines
+     * the point at which the connection will stop reading an HTTP request whose
+     * body is too large.
+     *
+     * The default is set by the max_http_body_size value from the template
+     * config
+     *
+     * @since 0.5.1
+     *
+     * @param new_value The value to set as the maximum message size.
+     */
+    void set_max_http_body_size(size_t new_value) {
+        m_max_http_body_size = new_value;
+    }
+
+    /*************************************/
+    /* Connection pass through functions */
+    /*************************************/
+
+    /**
+     * These functions act as adaptors to their counterparts in connection. They
+     * can produce one additional type of error, the bad_connection error, that
+     * indicates that the conversion from connection_hdl to connection_ptr
+     * failed due to the connection not existing anymore. Each method has a
+     * default and an exception free varient.
+     */
+
+    void interrupt(connection_hdl hdl, lib::error_code & ec);
+    void interrupt(connection_hdl hdl);
+
+    /// Pause reading of new data (exception free)
+    /**
+     * Signals to the connection to halt reading of new data. While reading is 
+     * paused, the connection will stop reading from its associated socket. In
+     * turn this will result in TCP based flow control kicking in and slowing
+     * data flow from the remote endpoint.
+     *
+     * This is useful for applications that push new requests to a queue to be 
+     * processed by another thread and need a way to signal when their request
+     * queue is full without blocking the network processing thread.
+     *
+     * Use `resume_reading()` to resume.
+     *
+     * If supported by the transport this is done asynchronously. As such
+     * reading may not stop until the current read operation completes. 
+     * Typically you can expect to receive no more bytes after initiating a read
+     * pause than the size of the read buffer.
+     *
+     * If reading is paused for this connection already nothing is changed.
+     */
+    void pause_reading(connection_hdl hdl, lib::error_code & ec);
+    
+    /// Pause reading of new data
+    void pause_reading(connection_hdl hdl);
+
+    /// Resume reading of new data (exception free)
+    /**
+     * Signals to the connection to resume reading of new data after it was 
+     * paused by `pause_reading()`.
+     *
+     * If reading is not paused for this connection already nothing is changed.
+     */
+    void resume_reading(connection_hdl hdl, lib::error_code & ec);
+
+    /// Resume reading of new data
+    void resume_reading(connection_hdl hdl);
+
+    /// Send deferred HTTP Response
+    /**
+     * Sends an http response to an HTTP connection that was deferred. This will
+     * send a complete response including all headers, status line, and body
+     * text. The connection will be closed afterwards.
+     *
+     * Exception free variant
+     *
+     * @since 0.6.0
+     *
+     * @param hdl The connection to send the response on
+     * @param ec A status code, zero on success, non-zero otherwise
+     */
+    void send_http_response(connection_hdl hdl, lib::error_code & ec);
+        
+    /// Send deferred HTTP Response (exception free)
+    /**
+     * Sends an http response to an HTTP connection that was deferred. This will
+     * send a complete response including all headers, status line, and body
+     * text. The connection will be closed afterwards.
+     *
+     * Exception variant
+     *
+     * @since 0.6.0
+     *
+     * @param hdl The connection to send the response on
+     */
+    void send_http_response(connection_hdl hdl);
+
+    /// Create a message and add it to the outgoing send queue (exception free)
+    /**
+     * Convenience method to send a message given a payload string and an opcode
+     *
+     * @param [in] hdl The handle identifying the connection to send via.
+     * @param [in] payload The payload string to generated the message with
+     * @param [in] op The opcode to generated the message with.
+     * @param [out] ec A code to fill in for errors
+     */
+    void send(connection_hdl hdl, std::string const & payload,
+        frame::opcode::value op, lib::error_code & ec);
+    /// Create a message and add it to the outgoing send queue
+    /**
+     * Convenience method to send a message given a payload string and an opcode
+     *
+     * @param [in] hdl The handle identifying the connection to send via.
+     * @param [in] payload The payload string to generated the message with
+     * @param [in] op The opcode to generated the message with.
+     * @param [out] ec A code to fill in for errors
+     */
+    void send(connection_hdl hdl, std::string const & payload,
+        frame::opcode::value op);
+
+    void send(connection_hdl hdl, void const * payload, size_t len,
+        frame::opcode::value op, lib::error_code & ec);
+    void send(connection_hdl hdl, void const * payload, size_t len,
+        frame::opcode::value op);
+
+    void send(connection_hdl hdl, message_ptr msg, lib::error_code & ec);
+    void send(connection_hdl hdl, message_ptr msg);
+
+    void close(connection_hdl hdl, close::status::value const code,
+        std::string const & reason, lib::error_code & ec);
+    void close(connection_hdl hdl, close::status::value const code,
+        std::string const & reason);
+
+    /// Send a ping to a specific connection
+    /**
+     * @since 0.3.0-alpha3
+     *
+     * @param [in] hdl The connection_hdl of the connection to send to.
+     * @param [in] payload The payload string to send.
+     * @param [out] ec A reference to an error code to fill in
+     */
+    void ping(connection_hdl hdl, std::string const & payload,
+        lib::error_code & ec);
+    /// Send a ping to a specific connection
+    /**
+     * Exception variant of `ping`
+     *
+     * @since 0.3.0-alpha3
+     *
+     * @param [in] hdl The connection_hdl of the connection to send to.
+     * @param [in] payload The payload string to send.
+     */
+    void ping(connection_hdl hdl, std::string const & payload);
+
+    /// Send a pong to a specific connection
+    /**
+     * @since 0.3.0-alpha3
+     *
+     * @param [in] hdl The connection_hdl of the connection to send to.
+     * @param [in] payload The payload string to send.
+     * @param [out] ec A reference to an error code to fill in
+     */
+    void pong(connection_hdl hdl, std::string const & payload,
+        lib::error_code & ec);
+    /// Send a pong to a specific connection
+    /**
+     * Exception variant of `pong`
+     *
+     * @since 0.3.0-alpha3
+     *
+     * @param [in] hdl The connection_hdl of the connection to send to.
+     * @param [in] payload The payload string to send.
+     */
+    void pong(connection_hdl hdl, std::string const & payload);
+
+    /// Retrieves a connection_ptr from a connection_hdl (exception free)
+    /**
+     * Converting a weak pointer to shared_ptr is not thread safe because the
+     * pointer could be deleted at any time.
+     *
+     * NOTE: This method may be called by handler to upgrade its handle to a
+     * full connection_ptr. That full connection may then be used safely for the
+     * remainder of the handler body. get_con_from_hdl and the resulting
+     * connection_ptr are NOT safe to use outside the handler loop.
+     *
+     * @param hdl The connection handle to translate
+     *
+     * @return the connection_ptr. May be NULL if the handle was invalid.
+     */
+    connection_ptr get_con_from_hdl(connection_hdl hdl, lib::error_code & ec) {
+        connection_ptr con = lib::static_pointer_cast<connection_type>(
+            hdl.lock());
+        if (!con) {
+            ec = error::make_error_code(error::bad_connection);
+        }
+        return con;
+    }
+
+    /// Retrieves a connection_ptr from a connection_hdl (exception version)
+    connection_ptr get_con_from_hdl(connection_hdl hdl) {
+        lib::error_code ec;
+        connection_ptr con = this->get_con_from_hdl(hdl,ec);
+        if (ec) {
+            throw exception(ec);
+        }
+        return con;
+    }
+protected:
+    connection_ptr create_connection();
+
+    alog_type m_alog;
+    elog_type m_elog;
+private:
+    // dynamic settings
+    std::string                 m_user_agent;
+
+    open_handler                m_open_handler;
+    close_handler               m_close_handler;
+    fail_handler                m_fail_handler;
+    ping_handler                m_ping_handler;
+    pong_handler                m_pong_handler;
+    pong_timeout_handler        m_pong_timeout_handler;
+    interrupt_handler           m_interrupt_handler;
+    http_handler                m_http_handler;
+    validate_handler            m_validate_handler;
+    message_handler             m_message_handler;
+
+    long                        m_open_handshake_timeout_dur;
+    long                        m_close_handshake_timeout_dur;
+    long                        m_pong_timeout_dur;
+    size_t                      m_max_message_size;
+    size_t                      m_max_http_body_size;
+
+    rng_type m_rng;
+
+    // static settings
+    bool const                  m_is_server;
+
+    // endpoint state
+    mutable mutex_type          m_mutex;
+};
+
+} // namespace websocketpp
+
+#include <websocketpp/impl/endpoint_impl.hpp>
+
+#endif // WEBSOCKETPP_ENDPOINT_HPP
diff --git a/vendor/websocketpp/websocketpp/endpoint_base.hpp b/vendor/websocketpp/websocketpp/endpoint_base.hpp
new file mode 100644
index 0000000..1ad1a44
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/endpoint_base.hpp
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_ENDPOINT_BASE_HPP
+#define WEBSOCKETPP_ENDPOINT_BASE_HPP
+
+namespace websocketpp {
+
+/// Stub for user supplied base class.
+class endpoint_base {};
+
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_ENDPOINT_BASE_HPP
diff --git a/vendor/websocketpp/websocketpp/error.hpp b/vendor/websocketpp/websocketpp/error.hpp
new file mode 100644
index 0000000..562fb6e
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/error.hpp
@@ -0,0 +1,277 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_ERROR_HPP
+#define WEBSOCKETPP_ERROR_HPP
+
+#include <exception>
+#include <string>
+#include <utility>
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/system_error.hpp>
+
+namespace websocketpp {
+
+/// Combination error code / string type for returning two values
+typedef std::pair<lib::error_code,std::string> err_str_pair;
+
+/// Library level error codes
+namespace error {
+enum value {
+    /// Catch-all library error
+    general = 1,
+
+    /// send attempted when endpoint write queue was full
+    send_queue_full,
+
+    /// Attempted an operation using a payload that was improperly formatted
+    /// ex: invalid UTF8 encoding on a text message.
+    payload_violation,
+
+    /// Attempted to open a secure connection with an insecure endpoint
+    endpoint_not_secure,
+
+    /// Attempted an operation that required an endpoint that is no longer
+    /// available. This is usually because the endpoint went out of scope
+    /// before a connection that it created.
+    endpoint_unavailable,
+
+    /// An invalid uri was supplied
+    invalid_uri,
+
+    /// The endpoint is out of outgoing message buffers
+    no_outgoing_buffers,
+
+    /// The endpoint is out of incoming message buffers
+    no_incoming_buffers,
+
+    /// The connection was in the wrong state for this operation
+    invalid_state,
+
+    /// Unable to parse close code
+    bad_close_code,
+
+    /// Close code is in a reserved range
+    reserved_close_code,
+
+    /// Close code is invalid
+    invalid_close_code,
+
+    /// Invalid UTF-8
+    invalid_utf8,
+
+    /// Invalid subprotocol
+    invalid_subprotocol,
+
+    /// An operation was attempted on a connection that did not exist or was
+    /// already deleted.
+    bad_connection,
+
+    /// Unit testing utility error code
+    test,
+
+    /// Connection creation attempted failed
+    con_creation_failed,
+
+    /// Selected subprotocol was not requested by the client
+    unrequested_subprotocol,
+
+    /// Attempted to use a client specific feature on a server endpoint
+    client_only,
+
+    /// Attempted to use a server specific feature on a client endpoint
+    server_only,
+
+    /// HTTP connection ended
+    http_connection_ended,
+
+    /// WebSocket opening handshake timed out
+    open_handshake_timeout,
+
+    /// WebSocket close handshake timed out
+    close_handshake_timeout,
+
+    /// Invalid port in URI
+    invalid_port,
+
+    /// An async accept operation failed because the underlying transport has been
+    /// requested to not listen for new connections anymore.
+    async_accept_not_listening,
+
+    /// The requested operation was canceled
+    operation_canceled,
+
+    /// Connection rejected
+    rejected,
+
+    /// Upgrade Required. This happens if an HTTP request is made to a
+    /// WebSocket++ server that doesn't implement an http handler
+    upgrade_required,
+
+    /// Invalid WebSocket protocol version
+    invalid_version,
+
+    /// Unsupported WebSocket protocol version
+    unsupported_version,
+
+    /// HTTP parse error
+    http_parse_error,
+    
+    /// Extension negotiation failed
+    extension_neg_failed
+}; // enum value
+
+
+class category : public lib::error_category {
+public:
+    category() {}
+
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case error::general:
+                return "Generic error";
+            case error::send_queue_full:
+                return "send queue full";
+            case error::payload_violation:
+                return "payload violation";
+            case error::endpoint_not_secure:
+                return "endpoint not secure";
+            case error::endpoint_unavailable:
+                return "endpoint not available";
+            case error::invalid_uri:
+                return "invalid uri";
+            case error::no_outgoing_buffers:
+                return "no outgoing message buffers";
+            case error::no_incoming_buffers:
+                return "no incoming message buffers";
+            case error::invalid_state:
+                return "invalid state";
+            case error::bad_close_code:
+                return "Unable to extract close code";
+            case error::invalid_close_code:
+                return "Extracted close code is in an invalid range";
+            case error::reserved_close_code:
+                return "Extracted close code is in a reserved range";
+            case error::invalid_utf8:
+                return "Invalid UTF-8";
+            case error::invalid_subprotocol:
+                return "Invalid subprotocol";
+            case error::bad_connection:
+                return "Bad Connection";
+            case error::test:
+                return "Test Error";
+            case error::con_creation_failed:
+                return "Connection creation attempt failed";
+            case error::unrequested_subprotocol:
+                return "Selected subprotocol was not requested by the client";
+            case error::client_only:
+                return "Feature not available on server endpoints";
+            case error::server_only:
+                return "Feature not available on client endpoints";
+            case error::http_connection_ended:
+                return "HTTP connection ended";
+            case error::open_handshake_timeout:
+                return "The opening handshake timed out";
+            case error::close_handshake_timeout:
+                return "The closing handshake timed out";
+            case error::invalid_port:
+                return "Invalid URI port";
+            case error::async_accept_not_listening:
+                return "Async Accept not listening";
+            case error::operation_canceled:
+                return "Operation canceled";
+            case error::rejected:
+                return "Connection rejected";
+            case error::upgrade_required:
+                return "Upgrade required";
+            case error::invalid_version:
+                return "Invalid version";
+            case error::unsupported_version:
+                return "Unsupported version";
+            case error::http_parse_error:
+                return "HTTP parse error";
+            case error::extension_neg_failed:
+                return "Extension negotiation failed";
+            default:
+                return "Unknown";
+        }
+    }
+};
+
+inline const lib::error_category& get_category() {
+    static category instance;
+    return instance;
+}
+
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_category());
+}
+
+} // namespace error
+} // namespace websocketpp
+
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum<websocketpp::error::value>
+{
+    static bool const value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+
+namespace websocketpp {
+
+class exception : public std::exception {
+public:
+    exception(std::string const & msg, lib::error_code ec = make_error_code(error::general))
+      : m_msg(msg.empty() ? ec.message() : msg), m_code(ec)
+    {}
+
+    explicit exception(lib::error_code ec)
+      : m_msg(ec.message()), m_code(ec)
+    {}
+
+    ~exception() throw() {}
+
+    virtual char const * what() const throw() {
+        return m_msg.c_str();
+    }
+
+    lib::error_code code() const throw() {
+        return m_code;
+    }
+
+    const std::string m_msg;
+    lib::error_code m_code;
+};
+
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_ERROR_HPP
diff --git a/vendor/websocketpp/websocketpp/extensions/extension.hpp b/vendor/websocketpp/websocketpp/extensions/extension.hpp
new file mode 100644
index 0000000..f5fbd9f
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/extensions/extension.hpp
@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_EXTENSION_HPP
+#define WEBSOCKETPP_EXTENSION_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/system_error.hpp>
+
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+
+/**
+ * Some generic information about extensions
+ *
+ * Each extension object has an implemented flag. It can be retrieved by calling
+ * is_implemented(). This compile time flag indicates whether or not the object
+ * in question actually implements the extension or if it is a placeholder stub
+ *
+ * Each extension object also has an enabled flag. It can be retrieved by
+ * calling is_enabled(). This runtime flag indicates whether or not the
+ * extension has been negotiated for this connection.
+ */
+namespace extensions {
+
+namespace error {
+enum value {
+    /// Catch all
+    general = 1,
+
+    /// Extension disabled
+    disabled
+};
+
+class category : public lib::error_category {
+public:
+    category() {}
+
+    const char *name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.extension";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case general:
+                return "Generic extension error";
+            case disabled:
+                return "Use of methods from disabled extension";
+            default:
+                return "Unknown permessage-compress error";
+        }
+    }
+};
+
+inline lib::error_category const & get_category() {
+    static category instance;
+    return instance;
+}
+
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_category());
+}
+
+} // namespace error
+} // namespace extensions
+} // namespace websocketpp
+
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum
+    <websocketpp::extensions::error::value>
+{
+    static const bool value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+
+#endif // WEBSOCKETPP_EXTENSION_HPP
diff --git a/vendor/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp b/vendor/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp
new file mode 100644
index 0000000..49c0e1d
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/extensions/permessage_deflate/disabled.hpp
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_EXTENSION_PERMESSAGE_DEFLATE_DISABLED_HPP
+#define WEBSOCKETPP_EXTENSION_PERMESSAGE_DEFLATE_DISABLED_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/system_error.hpp>
+
+#include <websocketpp/http/constants.hpp>
+#include <websocketpp/extensions/extension.hpp>
+
+#include <map>
+#include <string>
+#include <utility>
+
+namespace websocketpp {
+namespace extensions {
+namespace permessage_deflate {
+
+/// Stub class for use when disabling permessage_deflate extension
+/**
+ * This class is a stub that implements the permessage_deflate interface
+ * with minimal dependencies. It is used to disable permessage_deflate
+ * functionality at compile time without loading any unnecessary code.
+ */
+template <typename config>
+class disabled {
+    typedef std::pair<lib::error_code,std::string> err_str_pair;
+
+public:
+    /// Negotiate extension
+    /**
+     * The disabled extension always fails the negotiation with a disabled
+     * error.
+     *
+     * @param offer Attribute from client's offer
+     * @return Status code and value to return to remote endpoint
+     */
+    err_str_pair negotiate(http::attribute_list const &) {
+        return make_pair(make_error_code(error::disabled),std::string());
+    }
+
+    /// Initialize state
+    /**
+     * For the disabled extension state initialization is a no-op.
+     *
+     * @param is_server True to initialize as a server, false for a client.
+     * @return A code representing the error that occurred, if any
+     */
+    lib::error_code init(bool) {
+        return lib::error_code();
+    }
+
+    /// Returns true if the extension is capable of providing
+    /// permessage_deflate functionality
+    bool is_implemented() const {
+        return false;
+    }
+
+    /// Returns true if permessage_deflate functionality is active for this
+    /// connection
+    bool is_enabled() const {
+        return false;
+    }
+
+    /// Generate extension offer
+    /**
+     * Creates an offer string to include in the Sec-WebSocket-Extensions
+     * header of outgoing client requests.
+     *
+     * @return A WebSocket extension offer string for this extension
+     */
+    std::string generate_offer() const {
+        return "";
+    }
+
+    /// Compress bytes
+    /**
+     * @param [in] in String to compress
+     * @param [out] out String to append compressed bytes to
+     * @return Error or status code
+     */
+    lib::error_code compress(std::string const &, std::string &) {
+        return make_error_code(error::disabled);
+    }
+
+    /// Decompress bytes
+    /**
+     * @param buf Byte buffer to decompress
+     * @param len Length of buf
+     * @param out String to append decompressed bytes to
+     * @return Error or status code
+     */
+    lib::error_code decompress(uint8_t const *, size_t, std::string &) {
+        return make_error_code(error::disabled);
+    }
+};
+
+} // namespace permessage_deflate
+} // namespace extensions
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_EXTENSION_PERMESSAGE_DEFLATE_DISABLED_HPP
diff --git a/vendor/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp b/vendor/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp
new file mode 100644
index 0000000..1581f14
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/extensions/permessage_deflate/enabled.hpp
@@ -0,0 +1,752 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_PROCESSOR_EXTENSION_PERMESSAGEDEFLATE_HPP
+#define WEBSOCKETPP_PROCESSOR_EXTENSION_PERMESSAGEDEFLATE_HPP
+
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/common/platforms.hpp>
+#include <websocketpp/common/system_error.hpp>
+#include <websocketpp/error.hpp>
+
+#include <websocketpp/extensions/extension.hpp>
+
+#include "zlib.h"
+
+#include <algorithm>
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace extensions {
+
+/// Implementation of the draft permessage-deflate WebSocket extension
+/**
+ * ### permessage-deflate interface
+ *
+ * **init**\n
+ * `lib::error_code init(bool is_server)`\n
+ * Performs initialization
+ *
+ * **is_implimented**\n
+ * `bool is_implimented()`\n
+ * Returns whether or not the object impliments the extension or not
+ *
+ * **is_enabled**\n
+ * `bool is_enabled()`\n
+ * Returns whether or not the extension was negotiated for the current
+ * connection
+ *
+ * **generate_offer**\n
+ * `std::string generate_offer() const`\n
+ * Create an extension offer string based on local policy
+ *
+ * **validate_response**\n
+ * `lib::error_code validate_response(http::attribute_list const & response)`\n
+ * Negotiate the parameters of extension use
+ *
+ * **negotiate**\n
+ * `err_str_pair negotiate(http::attribute_list const & attributes)`\n
+ * Negotiate the parameters of extension use
+ *
+ * **compress**\n
+ * `lib::error_code compress(std::string const & in, std::string & out)`\n
+ * Compress the bytes in `in` and append them to `out`
+ *
+ * **decompress**\n
+ * `lib::error_code decompress(uint8_t const * buf, size_t len, std::string &
+ * out)`\n
+ * Decompress `len` bytes from `buf` and append them to string `out`
+ */
+namespace permessage_deflate {
+
+/// Permessage deflate error values
+namespace error {
+enum value {
+    /// Catch all
+    general = 1,
+
+    /// Invalid extension attributes
+    invalid_attributes,
+
+    /// Invalid extension attribute value
+    invalid_attribute_value,
+
+    /// Invalid megotiation mode
+    invalid_mode,
+
+    /// Unsupported extension attributes
+    unsupported_attributes,
+
+    /// Invalid value for max_window_bits
+    invalid_max_window_bits,
+
+    /// ZLib Error
+    zlib_error,
+
+    /// Uninitialized
+    uninitialized,
+};
+
+/// Permessage-deflate error category
+class category : public lib::error_category {
+public:
+    category() {}
+
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.extension.permessage-deflate";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case general:
+                return "Generic permessage-compress error";
+            case invalid_attributes:
+                return "Invalid extension attributes";
+            case invalid_attribute_value:
+                return "Invalid extension attribute value";
+            case invalid_mode:
+                return "Invalid permessage-deflate negotiation mode";
+            case unsupported_attributes:
+                return "Unsupported extension attributes";
+            case invalid_max_window_bits:
+                return "Invalid value for max_window_bits";
+            case zlib_error:
+                return "A zlib function returned an error";
+            case uninitialized:
+                return "Deflate extension must be initialized before use";
+            default:
+                return "Unknown permessage-compress error";
+        }
+    }
+};
+
+/// Get a reference to a static copy of the permessage-deflate error category
+inline lib::error_category const & get_category() {
+    static category instance;
+    return instance;
+}
+
+/// Create an error code in the permessage-deflate category
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_category());
+}
+
+} // namespace error
+} // namespace permessage_deflate
+} // namespace extensions
+} // namespace websocketpp
+
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum
+    <websocketpp::extensions::permessage_deflate::error::value>
+{
+    static bool const value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+namespace websocketpp {
+namespace extensions {
+namespace permessage_deflate {
+
+/// Default value for server_max_window_bits as defined by draft 17
+static uint8_t const default_server_max_window_bits = 15;
+/// Minimum value for server_max_window_bits as defined by draft 17
+static uint8_t const min_server_max_window_bits = 8;
+/// Maximum value for server_max_window_bits as defined by draft 17
+static uint8_t const max_server_max_window_bits = 15;
+
+/// Default value for client_max_window_bits as defined by draft 17
+static uint8_t const default_client_max_window_bits = 15;
+/// Minimum value for client_max_window_bits as defined by draft 17
+static uint8_t const min_client_max_window_bits = 8;
+/// Maximum value for client_max_window_bits as defined by draft 17
+static uint8_t const max_client_max_window_bits = 15;
+
+namespace mode {
+enum value {
+    /// Accept any value the remote endpoint offers
+    accept = 1,
+    /// Decline any value the remote endpoint offers. Insist on defaults.
+    decline,
+    /// Use the largest value common to both offers
+    largest,
+    /// Use the smallest value common to both offers
+    smallest
+};
+} // namespace mode
+
+template <typename config>
+class enabled {
+public:
+    enabled()
+      : m_enabled(false)
+      , m_server_no_context_takeover(false)
+      , m_client_no_context_takeover(false)
+      , m_server_max_window_bits(15)
+      , m_client_max_window_bits(15)
+      , m_server_max_window_bits_mode(mode::accept)
+      , m_client_max_window_bits_mode(mode::accept)
+      , m_initialized(false)
+      , m_compress_buffer_size(16384)
+    {
+        m_dstate.zalloc = Z_NULL;
+        m_dstate.zfree = Z_NULL;
+        m_dstate.opaque = Z_NULL;
+
+        m_istate.zalloc = Z_NULL;
+        m_istate.zfree = Z_NULL;
+        m_istate.opaque = Z_NULL;
+        m_istate.avail_in = 0;
+        m_istate.next_in = Z_NULL;
+    }
+
+    ~enabled() {
+        if (!m_initialized) {
+            return;
+        }
+
+        int ret = deflateEnd(&m_dstate);
+
+        if (ret != Z_OK) {
+            //std::cout << "error cleaning up zlib compression state"
+            //          << std::endl;
+        }
+
+        ret = inflateEnd(&m_istate);
+
+        if (ret != Z_OK) {
+            //std::cout << "error cleaning up zlib decompression state"
+            //          << std::endl;
+        }
+    }
+
+    /// Initialize zlib state
+    /**
+     * Note: this should be called *after* the negotiation methods. It will use
+     * information from the negotiation to determine how to initialize the zlib
+     * data structures.
+     *
+     * @todo memory level, strategy, etc are hardcoded
+     *
+     * @param is_server True to initialize as a server, false for a client.
+     * @return A code representing the error that occurred, if any
+     */
+    lib::error_code init(bool is_server) {
+        uint8_t deflate_bits;
+        uint8_t inflate_bits;
+
+        if (is_server) {
+            deflate_bits = m_server_max_window_bits;
+            inflate_bits = m_client_max_window_bits;
+        } else {
+            deflate_bits = m_client_max_window_bits;
+            inflate_bits = m_server_max_window_bits;
+        }
+
+        int ret = deflateInit2(
+            &m_dstate,
+            Z_DEFAULT_COMPRESSION,
+            Z_DEFLATED,
+            -1*deflate_bits,
+            4, // memory level 1-9
+            Z_DEFAULT_STRATEGY
+        );
+
+        if (ret != Z_OK) {
+            return make_error_code(error::zlib_error);
+        }
+
+        ret = inflateInit2(
+            &m_istate,
+            -1*inflate_bits
+        );
+
+        if (ret != Z_OK) {
+            return make_error_code(error::zlib_error);
+        }
+
+        m_compress_buffer.reset(new unsigned char[m_compress_buffer_size]);
+        if ((m_server_no_context_takeover && is_server) ||
+            (m_client_no_context_takeover && !is_server))
+        {
+            m_flush = Z_FULL_FLUSH;
+        } else {
+            m_flush = Z_SYNC_FLUSH;
+        }
+        m_initialized = true;
+        return lib::error_code();
+    }
+
+    /// Test if this object implements the permessage-deflate specification
+    /**
+     * Because this object does implieent it, it will always return true.
+     *
+     * @return Whether or not this object implements permessage-deflate
+     */
+    bool is_implemented() const {
+        return true;
+    }
+
+    /// Test if the extension was negotiated for this connection
+    /**
+     * Retrieves whether or not this extension is in use based on the initial
+     * handshake extension negotiations.
+     *
+     * @return Whether or not the extension is in use
+     */
+    bool is_enabled() const {
+        return m_enabled;
+    }
+
+    /// Reset server's outgoing LZ77 sliding window for each new message
+    /**
+     * Enabling this setting will cause the server's compressor to reset the
+     * compression state (the LZ77 sliding window) for every message. This
+     * means that the compressor will not look back to patterns in previous
+     * messages to improve compression. This will reduce the compression
+     * efficiency for large messages somewhat and small messages drastically.
+     *
+     * This option may reduce server compressor memory usage and client
+     * decompressor memory usage.
+     * @todo Document to what extent memory usage will be reduced
+     *
+     * For clients, this option is dependent on server support. Enabling it
+     * via this method does not guarantee that it will be successfully
+     * negotiated, only that it will be requested.
+     *
+     * For servers, no client support is required. Enabling this option on a
+     * server will result in its use. The server will signal to clients that
+     * the option will be in use so they can optimize resource usage if they
+     * are able.
+     */
+    void enable_server_no_context_takeover() {
+        m_server_no_context_takeover = true;
+    }
+
+    /// Reset client's outgoing LZ77 sliding window for each new message
+    /**
+     * Enabling this setting will cause the client's compressor to reset the
+     * compression state (the LZ77 sliding window) for every message. This
+     * means that the compressor will not look back to patterns in previous
+     * messages to improve compression. This will reduce the compression
+     * efficiency for large messages somewhat and small messages drastically.
+     *
+     * This option may reduce client compressor memory usage and server
+     * decompressor memory usage.
+     * @todo Document to what extent memory usage will be reduced
+     *
+     * This option is supported by all compliant clients and servers. Enabling
+     * it via either endpoint should be sufficient to ensure it is used.
+     */
+    void enable_client_no_context_takeover() {
+        m_client_no_context_takeover = true;
+    }
+
+    /// Limit server LZ77 sliding window size
+    /**
+     * The bits setting is the base 2 logarithm of the maximum window size that
+     * the server must use to compress outgoing messages. The permitted range
+     * is 8 to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB
+     * window. The default setting is 15.
+     *
+     * Mode Options:
+     * - accept: Accept whatever the remote endpoint offers.
+     * - decline: Decline any offers to deviate from the defaults
+     * - largest: Accept largest window size acceptable to both endpoints
+     * - smallest: Accept smallest window size acceptiable to both endpoints
+     *
+     * This setting is dependent on server support. A client requesting this
+     * setting may be rejected by the server or have the exact value used
+     * adjusted by the server. A server may unilaterally set this value without
+     * client support.
+     *
+     * @param bits The size to request for the outgoing window size
+     * @param mode The mode to use for negotiating this parameter
+     * @return A status code
+     */
+    lib::error_code set_server_max_window_bits(uint8_t bits, mode::value mode) {
+        if (bits < min_server_max_window_bits || bits > max_server_max_window_bits) {
+            return error::make_error_code(error::invalid_max_window_bits);
+        }
+        m_server_max_window_bits = bits;
+        m_server_max_window_bits_mode = mode;
+
+        return lib::error_code();
+    }
+
+    /// Limit client LZ77 sliding window size
+    /**
+     * The bits setting is the base 2 logarithm of the window size that the
+     * client must use to compress outgoing messages. The permitted range is 8
+     * to 15 inclusive. 8 represents a 256 byte window and 15 a 32KiB window.
+     * The default setting is 15.
+     *
+     * Mode Options:
+     * - accept: Accept whatever the remote endpoint offers.
+     * - decline: Decline any offers to deviate from the defaults
+     * - largest: Accept largest window size acceptable to both endpoints
+     * - smallest: Accept smallest window size acceptiable to both endpoints
+     *
+     * This setting is dependent on client support. A client may limit its own
+     * outgoing window size unilaterally. A server may only limit the client's
+     * window size if the remote client supports that feature.
+     *
+     * @param bits The size to request for the outgoing window size
+     * @param mode The mode to use for negotiating this parameter
+     * @return A status code
+     */
+    lib::error_code set_client_max_window_bits(uint8_t bits, mode::value mode) {
+        if (bits < min_client_max_window_bits || bits > max_client_max_window_bits) {
+            return error::make_error_code(error::invalid_max_window_bits);
+        }
+        m_client_max_window_bits = bits;
+        m_client_max_window_bits_mode = mode;
+
+        return lib::error_code();
+    }
+
+    /// Generate extension offer
+    /**
+     * Creates an offer string to include in the Sec-WebSocket-Extensions
+     * header of outgoing client requests.
+     *
+     * @return A WebSocket extension offer string for this extension
+     */
+    std::string generate_offer() const {
+        // TODO: this should be dynamically generated based on user settings
+        return "permessage-deflate; client_no_context_takeover; client_max_window_bits";
+    }
+
+    /// Validate extension response
+    /**
+     * Confirm that the server has negotiated settings compatible with our
+     * original offer and apply those settings to the extension state.
+     *
+     * @param response The server response attribute list to validate
+     * @return Validation error or 0 on success
+     */
+    lib::error_code validate_offer(http::attribute_list const &) {
+        return lib::error_code();
+    }
+
+    /// Negotiate extension
+    /**
+     * Confirm that the client's extension negotiation offer has settings
+     * compatible with local policy. If so, generate a reply and apply those
+     * settings to the extension state.
+     *
+     * @param offer Attribute from client's offer
+     * @return Status code and value to return to remote endpoint
+     */
+    err_str_pair negotiate(http::attribute_list const & offer) {
+        err_str_pair ret;
+
+        http::attribute_list::const_iterator it;
+        for (it = offer.begin(); it != offer.end(); ++it) {
+            if (it->first == "server_no_context_takeover") {
+                negotiate_server_no_context_takeover(it->second,ret.first);
+            } else if (it->first == "client_no_context_takeover") {
+                negotiate_client_no_context_takeover(it->second,ret.first);
+            } else if (it->first == "server_max_window_bits") {
+                negotiate_server_max_window_bits(it->second,ret.first);
+            } else if (it->first == "client_max_window_bits") {
+                negotiate_client_max_window_bits(it->second,ret.first);
+            } else {
+                ret.first = make_error_code(error::invalid_attributes);
+            }
+
+            if (ret.first) {
+                break;
+            }
+        }
+
+        if (ret.first == lib::error_code()) {
+            m_enabled = true;
+            ret.second = generate_response();
+        }
+
+        return ret;
+    }
+
+    /// Compress bytes
+    /**
+     * @todo: avail_in/out is 32 bit, need to fix for cases of >32 bit frames
+     * on 64 bit machines.
+     *
+     * @param [in] in String to compress
+     * @param [out] out String to append compressed bytes to
+     * @return Error or status code
+     */
+    lib::error_code compress(std::string const & in, std::string & out) {
+        if (!m_initialized) {
+            return make_error_code(error::uninitialized);
+        }
+
+        size_t output;
+
+        if (in.empty()) {
+            uint8_t buf[6] = {0x02, 0x00, 0x00, 0x00, 0xff, 0xff};
+            out.append((char *)(buf),6);
+            return lib::error_code();
+        }
+
+        m_dstate.avail_in = in.size();
+        m_dstate.next_in = (unsigned char *)(const_cast<char *>(in.data()));
+
+        do {
+            // Output to local buffer
+            m_dstate.avail_out = m_compress_buffer_size;
+            m_dstate.next_out = m_compress_buffer.get();
+
+            deflate(&m_dstate, m_flush);
+
+            output = m_compress_buffer_size - m_dstate.avail_out;
+
+            out.append((char *)(m_compress_buffer.get()),output);
+        } while (m_dstate.avail_out == 0);
+
+        return lib::error_code();
+    }
+
+    /// Decompress bytes
+    /**
+     * @param buf Byte buffer to decompress
+     * @param len Length of buf
+     * @param out String to append decompressed bytes to
+     * @return Error or status code
+     */
+    lib::error_code decompress(uint8_t const * buf, size_t len, std::string &
+        out)
+    {
+        if (!m_initialized) {
+            return make_error_code(error::uninitialized);
+        }
+
+        int ret;
+
+        m_istate.avail_in = len;
+        m_istate.next_in = const_cast<unsigned char *>(buf);
+
+        do {
+            m_istate.avail_out = m_compress_buffer_size;
+            m_istate.next_out = m_compress_buffer.get();
+
+            ret = inflate(&m_istate, Z_SYNC_FLUSH);
+
+            if (ret == Z_NEED_DICT || ret == Z_DATA_ERROR || ret == Z_MEM_ERROR) {
+                return make_error_code(error::zlib_error);
+            }
+
+            out.append(
+                reinterpret_cast<char *>(m_compress_buffer.get()),
+                m_compress_buffer_size - m_istate.avail_out
+            );
+        } while (m_istate.avail_out == 0);
+
+        return lib::error_code();
+    }
+private:
+    /// Generate negotiation response
+    /**
+     * @return Generate extension negotiation reponse string to send to client
+     */
+    std::string generate_response() {
+        std::string ret = "permessage-deflate";
+
+        if (m_server_no_context_takeover) {
+            ret += "; server_no_context_takeover";
+        }
+
+        if (m_client_no_context_takeover) {
+            ret += "; client_no_context_takeover";
+        }
+
+        if (m_server_max_window_bits < default_server_max_window_bits) {
+            std::stringstream s;
+            s << int(m_server_max_window_bits);
+            ret += "; server_max_window_bits="+s.str();
+        }
+
+        if (m_client_max_window_bits < default_client_max_window_bits) {
+            std::stringstream s;
+            s << int(m_client_max_window_bits);
+            ret += "; client_max_window_bits="+s.str();
+        }
+
+        return ret;
+    }
+
+    /// Negotiate server_no_context_takeover attribute
+    /**
+     * @param [in] value The value of the attribute from the offer
+     * @param [out] ec A reference to the error code to return errors via
+     */
+    void negotiate_server_no_context_takeover(std::string const & value,
+        lib::error_code & ec)
+    {
+        if (!value.empty()) {
+            ec = make_error_code(error::invalid_attribute_value);
+            return;
+        }
+
+        m_server_no_context_takeover = true;
+    }
+
+    /// Negotiate client_no_context_takeover attribute
+    /**
+     * @param [in] value The value of the attribute from the offer
+     * @param [out] ec A reference to the error code to return errors via
+     */
+    void negotiate_client_no_context_takeover(std::string const & value,
+        lib::error_code & ec)
+    {
+        if (!value.empty()) {
+            ec = make_error_code(error::invalid_attribute_value);
+            return;
+        }
+
+        m_client_no_context_takeover = true;
+    }
+
+    /// Negotiate server_max_window_bits attribute
+    /**
+     * When this method starts, m_server_max_window_bits will contain the server's
+     * preferred value and m_server_max_window_bits_mode will contain the mode the
+     * server wants to use to for negotiation. `value` contains the value the
+     * client requested that we use.
+     *
+     * options:
+     * - decline (refuse to use the attribute)
+     * - accept (use whatever the client says)
+     * - largest (use largest possible value)
+     * - smallest (use smallest possible value)
+     *
+     * @param [in] value The value of the attribute from the offer
+     * @param [out] ec A reference to the error code to return errors via
+     */
+    void negotiate_server_max_window_bits(std::string const & value,
+        lib::error_code & ec)
+    {
+        uint8_t bits = uint8_t(atoi(value.c_str()));
+
+        if (bits < min_server_max_window_bits || bits > max_server_max_window_bits) {
+            ec = make_error_code(error::invalid_attribute_value);
+            m_server_max_window_bits = default_server_max_window_bits;
+            return;
+        }
+
+        switch (m_server_max_window_bits_mode) {
+            case mode::decline:
+                m_server_max_window_bits = default_server_max_window_bits;
+                break;
+            case mode::accept:
+                m_server_max_window_bits = bits;
+                break;
+            case mode::largest:
+                m_server_max_window_bits = std::min(bits,m_server_max_window_bits);
+                break;
+            case mode::smallest:
+                m_server_max_window_bits = min_server_max_window_bits;
+                break;
+            default:
+                ec = make_error_code(error::invalid_mode);
+                m_server_max_window_bits = default_server_max_window_bits;
+        }
+    }
+
+    /// Negotiate client_max_window_bits attribute
+    /**
+     * When this method starts, m_client_max_window_bits and m_c2s_max_window_mode
+     * will contain the server's preferred values for window size and
+     * negotiation mode.
+     *
+     * options:
+     * - decline (refuse to use the attribute)
+     * - accept (use whatever the client says)
+     * - largest (use largest possible value)
+     * - smallest (use smallest possible value)
+     *
+     * @param [in] value The value of the attribute from the offer
+     * @param [out] ec A reference to the error code to return errors via
+     */
+    void negotiate_client_max_window_bits(std::string const & value,
+            lib::error_code & ec)
+    {
+        uint8_t bits = uint8_t(atoi(value.c_str()));
+
+        if (value.empty()) {
+            bits = default_client_max_window_bits;
+        } else if (bits < min_client_max_window_bits ||
+                   bits > max_client_max_window_bits)
+        {
+            ec = make_error_code(error::invalid_attribute_value);
+            m_client_max_window_bits = default_client_max_window_bits;
+            return;
+        }
+
+        switch (m_client_max_window_bits_mode) {
+            case mode::decline:
+                m_client_max_window_bits = default_client_max_window_bits;
+                break;
+            case mode::accept:
+                m_client_max_window_bits = bits;
+                break;
+            case mode::largest:
+                m_client_max_window_bits = std::min(bits,m_client_max_window_bits);
+                break;
+            case mode::smallest:
+                m_client_max_window_bits = min_client_max_window_bits;
+                break;
+            default:
+                ec = make_error_code(error::invalid_mode);
+                m_client_max_window_bits = default_client_max_window_bits;
+        }
+    }
+
+    bool m_enabled;
+    bool m_server_no_context_takeover;
+    bool m_client_no_context_takeover;
+    uint8_t m_server_max_window_bits;
+    uint8_t m_client_max_window_bits;
+    mode::value m_server_max_window_bits_mode;
+    mode::value m_client_max_window_bits_mode;
+
+    bool m_initialized;
+    int m_flush;
+    size_t m_compress_buffer_size;
+    lib::unique_ptr_uchar_array m_compress_buffer;
+    z_stream m_dstate;
+    z_stream m_istate;
+};
+
+} // namespace permessage_deflate
+} // namespace extensions
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_PROCESSOR_EXTENSION_PERMESSAGEDEFLATE_HPP
diff --git a/vendor/websocketpp/websocketpp/frame.hpp b/vendor/websocketpp/websocketpp/frame.hpp
new file mode 100644
index 0000000..8a17337
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/frame.hpp
@@ -0,0 +1,861 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_FRAME_HPP
+#define WEBSOCKETPP_FRAME_HPP
+
+#include <algorithm>
+#include <string>
+
+#include <websocketpp/common/system_error.hpp>
+#include <websocketpp/common/network.hpp>
+
+#include <websocketpp/utilities.hpp>
+
+namespace websocketpp {
+/// Data structures and utility functions for manipulating WebSocket frames
+/**
+ * namespace frame provides a number of data structures and utility functions
+ * for reading, writing, and manipulating binary encoded WebSocket frames.
+ */
+namespace frame {
+
+/// Minimum length of a WebSocket frame header.
+static unsigned int const BASIC_HEADER_LENGTH = 2;
+/// Maximum length of a WebSocket header
+static unsigned int const MAX_HEADER_LENGTH = 14;
+/// Maximum length of the variable portion of the WebSocket header
+static unsigned int const MAX_EXTENDED_HEADER_LENGTH = 12;
+
+/// Two byte conversion union
+union uint16_converter {
+    uint16_t i;
+    uint8_t  c[2];
+};
+
+/// Four byte conversion union
+union uint32_converter {
+    uint32_t i;
+    uint8_t c[4];
+};
+
+/// Eight byte conversion union
+union uint64_converter {
+    uint64_t i;
+    uint8_t  c[8];
+};
+
+/// Constants and utility functions related to WebSocket opcodes
+/**
+ * WebSocket Opcodes are 4 bits. See RFC6455 section 5.2.
+ */
+namespace opcode {
+    enum value {
+        continuation = 0x0,
+        text = 0x1,
+        binary = 0x2,
+        rsv3 = 0x3,
+        rsv4 = 0x4,
+        rsv5 = 0x5,
+        rsv6 = 0x6,
+        rsv7 = 0x7,
+        close = 0x8,
+        ping = 0x9,
+        pong = 0xA,
+        control_rsvb = 0xB,
+        control_rsvc = 0xC,
+        control_rsvd = 0xD,
+        control_rsve = 0xE,
+        control_rsvf = 0xF,
+
+        CONTINUATION = 0x0,
+        TEXT = 0x1,
+        BINARY = 0x2,
+        RSV3 = 0x3,
+        RSV4 = 0x4,
+        RSV5 = 0x5,
+        RSV6 = 0x6,
+        RSV7 = 0x7,
+        CLOSE = 0x8,
+        PING = 0x9,
+        PONG = 0xA,
+        CONTROL_RSVB = 0xB,
+        CONTROL_RSVC = 0xC,
+        CONTROL_RSVD = 0xD,
+        CONTROL_RSVE = 0xE,
+        CONTROL_RSVF = 0xF
+    };
+
+    /// Check if an opcode is reserved
+    /**
+     * @param v The opcode to test.
+     * @return Whether or not the opcode is reserved.
+     */
+    inline bool reserved(value v) {
+        return (v >= rsv3 && v <= rsv7) ||
+               (v >= control_rsvb && v <= control_rsvf);
+    }
+
+    /// Check if an opcode is invalid
+    /**
+     * Invalid opcodes are negative or require greater than 4 bits to store.
+     *
+     * @param v The opcode to test.
+     * @return Whether or not the opcode is invalid.
+     */
+    inline bool invalid(value v) {
+        return (v > 0xF || v < 0);
+    }
+
+    /// Check if an opcode is for a control frame
+    /**
+     * @param v The opcode to test.
+     * @return Whether or not the opcode is a control opcode.
+     */
+    inline bool is_control(value v) {
+        return v >= 0x8;
+    }
+}
+
+/// Constants related to frame and payload limits
+namespace limits {
+    /// Minimum length of a WebSocket frame header.
+    static unsigned int const basic_header_length = 2;
+
+    /// Maximum length of a WebSocket header
+    static unsigned int const max_header_length = 14;
+
+    /// Maximum length of the variable portion of the WebSocket header
+    static unsigned int const max_extended_header_length = 12;
+
+    /// Maximum size of a basic WebSocket payload
+    static uint8_t const payload_size_basic = 125;
+
+    /// Maximum size of an extended WebSocket payload (basic payload = 126)
+    static uint16_t const payload_size_extended = 0xFFFF; // 2^16, 65535
+
+    /// Maximum size of a jumbo WebSocket payload (basic payload = 127)
+    static uint64_t const payload_size_jumbo = 0x7FFFFFFFFFFFFFFFLL;//2^63
+
+    /// Maximum size of close frame reason
+    /**
+     * This is payload_size_basic - 2 bytes (as first two bytes are used for
+     * the close code
+     */
+    static uint8_t const close_reason_size = 123;
+}
+
+
+// masks for fields in the basic header
+static uint8_t const BHB0_OPCODE = 0x0F;
+static uint8_t const BHB0_RSV3 = 0x10;
+static uint8_t const BHB0_RSV2 = 0x20;
+static uint8_t const BHB0_RSV1 = 0x40;
+static uint8_t const BHB0_FIN = 0x80;
+
+static uint8_t const BHB1_PAYLOAD = 0x7F;
+static uint8_t const BHB1_MASK = 0x80;
+
+static uint8_t const payload_size_code_16bit = 0x7E; // 126
+static uint8_t const payload_size_code_64bit = 0x7F; // 127
+
+typedef uint32_converter masking_key_type;
+
+/// The constant size component of a WebSocket frame header
+struct basic_header {
+    basic_header() : b0(0x00),b1(0x00) {}
+
+    basic_header(uint8_t p0, uint8_t p1) : b0(p0), b1(p1) {}
+
+    basic_header(opcode::value op, uint64_t size, bool fin, bool mask,
+        bool rsv1 = false, bool rsv2 = false, bool rsv3 = false) : b0(0x00),
+        b1(0x00)
+    {
+        if (fin) {
+            b0 |= BHB0_FIN;
+        }
+        if (rsv1) {
+            b0 |= BHB0_RSV1;
+        }
+        if (rsv2) {
+            b0 |= BHB0_RSV2;
+        }
+        if (rsv3) {
+            b0 |= BHB0_RSV3;
+        }
+        b0 |= (op & BHB0_OPCODE);
+
+        if (mask) {
+            b1 |= BHB1_MASK;
+        }
+
+        uint8_t basic_value;
+
+        if (size <= limits::payload_size_basic) {
+            basic_value = static_cast<uint8_t>(size);
+        } else if (size <= limits::payload_size_extended) {
+            basic_value = payload_size_code_16bit;
+        } else {
+            basic_value = payload_size_code_64bit;
+        }
+
+
+        b1 |= basic_value;
+    }
+
+    uint8_t b0;
+    uint8_t b1;
+};
+
+/// The variable size component of a WebSocket frame header
+struct extended_header {
+    extended_header() {
+        std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
+    }
+
+    extended_header(uint64_t payload_size) {
+        std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
+
+        copy_payload(payload_size);
+    }
+
+    extended_header(uint64_t payload_size, uint32_t masking_key) {
+        std::fill_n(this->bytes,MAX_EXTENDED_HEADER_LENGTH,0x00);
+
+        // Copy payload size
+        int offset = copy_payload(payload_size);
+
+        // Copy Masking Key
+        uint32_converter temp32;
+        temp32.i = masking_key;
+        std::copy(temp32.c,temp32.c+4,bytes+offset);
+    }
+
+    uint8_t bytes[MAX_EXTENDED_HEADER_LENGTH];
+private:
+    int copy_payload(uint64_t payload_size) {
+        int payload_offset = 0;
+
+        if (payload_size <= limits::payload_size_basic) {
+            payload_offset = 8;
+        } else if (payload_size <= limits::payload_size_extended) {
+            payload_offset = 6;
+        }
+
+        uint64_converter temp64;
+        temp64.i = lib::net::_htonll(payload_size);
+        std::copy(temp64.c+payload_offset,temp64.c+8,bytes);
+
+        return 8-payload_offset;
+    }
+};
+
+bool get_fin(basic_header const &h);
+void set_fin(basic_header &h, bool value);
+bool get_rsv1(basic_header const &h);
+void set_rsv1(basic_header &h, bool value);
+bool get_rsv2(basic_header const &h);
+void set_rsv2(basic_header &h, bool value);
+bool get_rsv3(basic_header const &h);
+void set_rsv3(basic_header &h, bool value);
+opcode::value get_opcode(basic_header const &h);
+bool get_masked(basic_header const &h);
+void set_masked(basic_header &h, bool value);
+uint8_t get_basic_size(basic_header const &);
+size_t get_header_len(basic_header const &);
+unsigned int get_masking_key_offset(basic_header const &);
+
+std::string write_header(basic_header const &, extended_header const &);
+masking_key_type get_masking_key(basic_header const &, extended_header const &);
+uint16_t get_extended_size(extended_header const &);
+uint64_t get_jumbo_size(extended_header const &);
+uint64_t get_payload_size(basic_header const &, extended_header const &);
+
+size_t prepare_masking_key(masking_key_type const & key);
+size_t circshift_prepared_key(size_t prepared_key, size_t offset);
+
+// Functions for performing xor based masking and unmasking
+template <typename input_iter, typename output_iter>
+void byte_mask(input_iter b, input_iter e, output_iter o, masking_key_type
+    const & key, size_t key_offset = 0);
+template <typename iter_type>
+void byte_mask(iter_type b, iter_type e, masking_key_type const & key,
+    size_t key_offset = 0);
+void word_mask_exact(uint8_t * input, uint8_t * output, size_t length,
+    masking_key_type const & key);
+void word_mask_exact(uint8_t * data, size_t length, masking_key_type const &
+    key);
+size_t word_mask_circ(uint8_t * input, uint8_t * output, size_t length,
+    size_t prepared_key);
+size_t word_mask_circ(uint8_t * data, size_t length, size_t prepared_key);
+
+/// Check whether the frame's FIN bit is set.
+/**
+ * @param [in] h The basic header to extract from.
+ * @return True if the header's fin bit is set.
+ */
+inline bool get_fin(basic_header const & h) {
+    return ((h.b0 & BHB0_FIN) == BHB0_FIN);
+}
+
+/// Set the frame's FIN bit
+/**
+ * @param [out] h Header to set.
+ * @param [in] value Value to set it to.
+ */
+inline void set_fin(basic_header & h, bool value) {
+    h.b0 = (value ? h.b0 | BHB0_FIN : h.b0 & ~BHB0_FIN);
+}
+
+/// check whether the frame's RSV1 bit is set
+/**
+ * @param [in] h The basic header to extract from.
+ * @return True if the header's RSV1 bit is set.
+ */
+inline bool get_rsv1(const basic_header &h) {
+    return ((h.b0 & BHB0_RSV1) == BHB0_RSV1);
+}
+
+/// Set the frame's RSV1 bit
+/**
+ * @param [out] h Header to set.
+ * @param [in] value Value to set it to.
+ */
+inline void set_rsv1(basic_header &h, bool value) {
+    h.b0 = (value ? h.b0 | BHB0_RSV1 : h.b0 & ~BHB0_RSV1);
+}
+
+/// check whether the frame's RSV2 bit is set
+/**
+ * @param [in] h The basic header to extract from.
+ * @return True if the header's RSV2 bit is set.
+ */
+inline bool get_rsv2(const basic_header &h) {
+    return ((h.b0 & BHB0_RSV2) == BHB0_RSV2);
+}
+
+/// Set the frame's RSV2 bit
+/**
+ * @param [out] h Header to set.
+ * @param [in] value Value to set it to.
+ */
+inline void set_rsv2(basic_header &h, bool value) {
+    h.b0 = (value ? h.b0 | BHB0_RSV2 : h.b0 & ~BHB0_RSV2);
+}
+
+/// check whether the frame's RSV3 bit is set
+/**
+ * @param [in] h The basic header to extract from.
+ * @return True if the header's RSV3 bit is set.
+ */
+inline bool get_rsv3(const basic_header &h) {
+    return ((h.b0 & BHB0_RSV3) == BHB0_RSV3);
+}
+
+/// Set the frame's RSV3 bit
+/**
+ * @param [out] h Header to set.
+ * @param [in] value Value to set it to.
+ */
+inline void set_rsv3(basic_header &h, bool value) {
+    h.b0 = (value ? h.b0 | BHB0_RSV3 : h.b0 & ~BHB0_RSV3);
+}
+
+/// Extract opcode from basic header
+/**
+ * @param [in] h The basic header to extract from.
+ * @return The opcode value of the header.
+ */
+inline opcode::value get_opcode(const basic_header &h) {
+    return opcode::value(h.b0 & BHB0_OPCODE);
+}
+
+/// check whether the frame is masked
+/**
+ * @param [in] h The basic header to extract from.
+ * @return True if the header mask bit is set.
+ */
+inline bool get_masked(basic_header const & h) {
+    return ((h.b1 & BHB1_MASK) == BHB1_MASK);
+}
+
+/// Set the frame's MASK bit
+/**
+ * @param [out] h Header to set.
+ * @param value Value to set it to.
+ */
+inline void set_masked(basic_header & h, bool value) {
+    h.b1 = (value ? h.b1 | BHB1_MASK : h.b1 & ~BHB1_MASK);
+}
+
+/// Extracts the raw payload length specified in the basic header
+/**
+ * A basic WebSocket frame header contains a 7 bit value that represents the
+ * payload size. There are two reserved values that are used to indicate that
+ * the actual payload size will not fit in 7 bits and that the full payload
+ * size is included in a separate field. The values are as follows:
+ *
+ * PAYLOAD_SIZE_CODE_16BIT (0x7E) indicates that the actual payload is less
+ * than 16 bit
+ *
+ * PAYLOAD_SIZE_CODE_64BIT (0x7F) indicates that the actual payload is less
+ * than 63 bit
+ *
+ * @param [in] h Basic header to read value from.
+ * @return The exact size encoded in h.
+ */
+inline uint8_t get_basic_size(const basic_header &h) {
+    return h.b1 & BHB1_PAYLOAD;
+}
+
+/// Calculates the full length of the header based on the first bytes.
+/**
+ * A WebSocket frame header always has at least two bytes. Encoded within the
+ * first two bytes is all the information necessary to calculate the full
+ * (variable) header length. get_header_len() calculates the full header
+ * length for the given two byte basic header.
+ *
+ * @param h Basic frame header to extract size from.
+ * @return Full length of the extended header.
+ */
+inline size_t get_header_len(basic_header const & h) {
+    // TODO: check extensions?
+
+    // masking key offset represents the space used for the extended length
+    // fields
+    size_t size = BASIC_HEADER_LENGTH + get_masking_key_offset(h);
+
+    // If the header is masked there is a 4 byte masking key
+    if (get_masked(h)) {
+        size += 4;
+    }
+
+    return size;
+}
+
+/// Calculate the offset location of the masking key within the extended header
+/**
+ * Calculate the offset location of the masking key within the extended header
+ * using information from its corresponding basic header
+ *
+ * @param h Corresponding basic header to calculate from.
+ *
+ * @return byte offset of the first byte of the masking key
+ */
+inline unsigned int get_masking_key_offset(const basic_header &h) {
+    if (get_basic_size(h) == payload_size_code_16bit) {
+        return 2;
+    } else if (get_basic_size(h) == payload_size_code_64bit) {
+        return 8;
+    } else {
+        return 0;
+    }
+}
+
+/// Generate a properly sized contiguous string that encodes a full frame header
+/**
+ * Copy the basic header h and extended header e into a properly sized
+ * contiguous frame header string for the purposes of writing out to the wire.
+ *
+ * @param h The basic header to include
+ * @param e The extended header to include
+ *
+ * @return A contiguous string containing h and e
+ */
+inline std::string prepare_header(const basic_header &h, const
+    extended_header &e)
+{
+    std::string ret;
+
+    ret.push_back(char(h.b0));
+    ret.push_back(char(h.b1));
+    ret.append(
+        reinterpret_cast<const char*>(e.bytes),
+        get_header_len(h)-BASIC_HEADER_LENGTH
+    );
+
+    return ret;
+}
+
+/// Extract the masking key from a frame header
+/**
+ * Note that while read and written as an integer at times, this value is not
+ * an integer and should never be interpreted as one. Big and little endian
+ * machines will generate and store masking keys differently without issue as
+ * long as the integer values remain irrelivant.
+ *
+ * @param h The basic header to extract from
+ * @param e The extended header to extract from
+ *
+ * @return The masking key as an integer.
+ */
+inline masking_key_type get_masking_key(const basic_header &h, const
+    extended_header &e)
+{
+    masking_key_type temp32;
+
+    if (!get_masked(h)) {
+        temp32.i = 0;
+    } else {
+        unsigned int offset = get_masking_key_offset(h);
+        std::copy(e.bytes+offset,e.bytes+offset+4,temp32.c);
+    }
+
+    return temp32;
+}
+
+/// Extract the extended size field from an extended header
+/**
+ * It is the responsibility of the caller to verify that e is a valid extended
+ * header. This function assumes that e contains an extended payload size.
+ *
+ * @param e The extended header to extract from
+ *
+ * @return The size encoded in the extended header in host byte order
+ */
+inline uint16_t get_extended_size(const extended_header &e) {
+    uint16_converter temp16;
+    std::copy(e.bytes,e.bytes+2,temp16.c);
+    return ntohs(temp16.i);
+}
+
+/// Extract the jumbo size field from an extended header
+/**
+ * It is the responsibility of the caller to verify that e is a valid extended
+ * header. This function assumes that e contains a jumbo payload size.
+ *
+ * @param e The extended header to extract from
+ *
+ * @return The size encoded in the extended header in host byte order
+ */
+inline uint64_t get_jumbo_size(const extended_header &e) {
+    uint64_converter temp64;
+    std::copy(e.bytes,e.bytes+8,temp64.c);
+    return lib::net::_ntohll(temp64.i);
+}
+
+/// Extract the full payload size field from a WebSocket header
+/**
+ * It is the responsibility of the caller to verify that h and e together
+ * represent a valid WebSocket frame header. This function assumes only that h
+ * and e are valid. It uses information in the basic header to determine where
+ * to look for the payload_size
+ *
+ * @param h The basic header to extract from
+ * @param e The extended header to extract from
+ *
+ * @return The size encoded in the combined header in host byte order.
+ */
+inline uint64_t get_payload_size(const basic_header &h, const
+    extended_header &e)
+{
+    uint8_t val = get_basic_size(h);
+
+    if (val <= limits::payload_size_basic) {
+        return val;
+    } else if (val == payload_size_code_16bit) {
+        return get_extended_size(e);
+    } else {
+        return get_jumbo_size(e);
+    }
+}
+
+/// Extract a masking key into a value the size of a machine word.
+/**
+ * Machine word size must be 4 or 8.
+ *
+ * @param key Masking key to extract from
+ *
+ * @return prepared key as a machine word
+ */
+inline size_t prepare_masking_key(const masking_key_type& key) {
+    size_t low_bits = static_cast<size_t>(key.i);
+
+    if (sizeof(size_t) == 8) {
+        uint64_t high_bits = static_cast<size_t>(key.i);
+        return static_cast<size_t>((high_bits << 32) | low_bits);
+    } else {
+        return low_bits;
+    }
+}
+
+/// circularly shifts the supplied prepared masking key by offset bytes
+/**
+ * Prepared_key must be the output of prepare_masking_key with the associated
+ * restrictions on the machine word size. offset must be greater than or equal
+ * to zero and less than sizeof(size_t).
+ */
+inline size_t circshift_prepared_key(size_t prepared_key, size_t offset) {
+    if (lib::net::is_little_endian()) {
+        size_t temp = prepared_key << (sizeof(size_t)-offset)*8;
+        return (prepared_key >> offset*8) | temp;
+    } else {
+        size_t temp = prepared_key >> (sizeof(size_t)-offset)*8;
+        return (prepared_key << offset*8) | temp;
+    }
+}
+
+/// Byte by byte mask/unmask
+/**
+ * Iterator based byte by byte masking and unmasking for WebSocket payloads.
+ * Performs masking in place using the supplied key offset by the supplied
+ * offset number of bytes.
+ *
+ * This function is simple and can be done in place on input with arbitrary
+ * lengths and does not vary based on machine word size. It is slow.
+ *
+ * @param b Beginning iterator to start masking
+ *
+ * @param e Ending iterator to end masking
+ *
+ * @param o Beginning iterator to store masked results
+ *
+ * @param key 32 bit key to mask with.
+ *
+ * @param key_offset offset value to start masking at.
+ */
+template <typename input_iter, typename output_iter>
+void byte_mask(input_iter first, input_iter last, output_iter result,
+    masking_key_type const & key, size_t key_offset)
+{
+    size_t key_index = key_offset%4;
+    while (first != last) {
+        *result = *first ^ key.c[key_index++];
+        key_index %= 4;
+        ++result;
+        ++first;
+    }
+}
+
+/// Byte by byte mask/unmask (in place)
+/**
+ * Iterator based byte by byte masking and unmasking for WebSocket payloads.
+ * Performs masking in place using the supplied key offset by the supplied
+ * offset number of bytes.
+ *
+ * This function is simple and can be done in place on input with arbitrary
+ * lengths and does not vary based on machine word size. It is slow.
+ *
+ * @param b Beginning iterator to start masking
+ *
+ * @param e Ending iterator to end masking
+ *
+ * @param key 32 bit key to mask with.
+ *
+ * @param key_offset offset value to start masking at.
+ */
+template <typename iter_type>
+void byte_mask(iter_type b, iter_type e, masking_key_type const & key,
+    size_t key_offset)
+{
+    byte_mask(b,e,b,key,key_offset);
+}
+
+/// Exact word aligned mask/unmask
+/**
+ * Balanced combination of byte by byte and circular word by word masking.
+ * Best used to mask complete messages at once. Has much higher setup costs than
+ * word_mask_circ but works with exact sized buffers.
+ *
+ * Buffer based word by word masking and unmasking for WebSocket payloads.
+ * Masking is done in word by word chunks with the remainder not divisible by
+ * the word size done byte by byte.
+ *
+ * input and output must both be at least length bytes. Exactly length bytes
+ * will be written.
+ *
+ * @param input buffer to mask or unmask
+ *
+ * @param output buffer to store the output. May be the same as input.
+ *
+ * @param length length of data buffer
+ *
+ * @param key Masking key to use
+ */
+inline void word_mask_exact(uint8_t* input, uint8_t* output, size_t length,
+    const masking_key_type& key)
+{
+    size_t prepared_key = prepare_masking_key(key);
+    size_t n = length/sizeof(size_t);
+    size_t* input_word = reinterpret_cast<size_t*>(input);
+    size_t* output_word = reinterpret_cast<size_t*>(output);
+
+    for (size_t i = 0; i < n; i++) {
+        output_word[i] = input_word[i] ^ prepared_key;
+    }
+
+    for (size_t i = n*sizeof(size_t); i < length; i++) {
+        output[i] = input[i] ^ key.c[i%4];
+    }
+}
+
+/// Exact word aligned mask/unmask (in place)
+/**
+ * In place version of word_mask_exact
+ *
+ * @see word_mask_exact
+ *
+ * @param data buffer to read and write from
+ *
+ * @param length length of data buffer
+ *
+ * @param key Masking key to use
+ */
+inline void word_mask_exact(uint8_t* data, size_t length, const
+    masking_key_type& key)
+{
+    word_mask_exact(data,data,length,key);
+}
+
+/// Circular word aligned mask/unmask
+/**
+ * Performs a circular mask/unmask in word sized chunks using pre-prepared keys
+ * that store state between calls. Best for providing streaming masking or
+ * unmasking of small chunks at a time of a larger message. Requires that the
+ * underlying allocated size of the data buffer be a multiple of the word size.
+ * Data in the buffer after `length` will be overwritten only with the same
+ * values that were originally present.
+ *
+ * Buffer based word by word masking and unmasking for WebSocket payloads.
+ * Performs masking in place using the supplied key. Casts the data buffer to
+ * an array of size_t's and performs masking word by word. The underlying
+ * buffer size must be a muliple of the word size.
+ *
+ * word_mask returns a copy of prepared_key circularly shifted based on the
+ * length value. The returned value may be fed back into word_mask when more
+ * data is available.
+ *
+ * input and output must both have length at least:
+ *    ceil(length/sizeof(size_t))*sizeof(size_t)
+ * Exactly that many bytes will be written, although only exactly length bytes
+ * will be changed (trailing bytes will be replaced without masking)
+ *
+ * @param data Character buffer to mask
+ *
+ * @param length Length of data
+ *
+ * @param prepared_key Prepared key to use.
+ *
+ * @return the prepared_key shifted to account for the input length
+ */
+inline size_t word_mask_circ(uint8_t * input, uint8_t * output, size_t length,
+    size_t prepared_key)
+{
+    size_t n = length / sizeof(size_t); // whole words
+    size_t l = length - (n * sizeof(size_t)); // remaining bytes
+    size_t * input_word = reinterpret_cast<size_t *>(input);
+    size_t * output_word = reinterpret_cast<size_t *>(output);
+
+    // mask word by word
+    for (size_t i = 0; i < n; i++) {
+        output_word[i] = input_word[i] ^ prepared_key;
+    }
+
+    // mask partial word at the end
+    size_t start = length - l;
+    uint8_t * byte_key = reinterpret_cast<uint8_t *>(&prepared_key);
+    for (size_t i = 0; i < l; ++i) {
+        output[start+i] = input[start+i] ^ byte_key[i];
+    }
+
+    return circshift_prepared_key(prepared_key,l);
+}
+
+/// Circular word aligned mask/unmask (in place)
+/**
+ * In place version of word_mask_circ
+ *
+ * @see word_mask_circ
+ *
+ * @param data Character buffer to read from and write to
+ *
+ * @param length Length of data
+ *
+ * @param prepared_key Prepared key to use.
+ *
+ * @return the prepared_key shifted to account for the input length
+ */
+inline size_t word_mask_circ(uint8_t* data, size_t length, size_t prepared_key){
+    return word_mask_circ(data,data,length,prepared_key);
+}
+
+/// Circular byte aligned mask/unmask
+/**
+ * Performs a circular mask/unmask in byte sized chunks using pre-prepared keys
+ * that store state between calls. Best for providing streaming masking or
+ * unmasking of small chunks at a time of a larger message. Requires that the
+ * underlying allocated size of the data buffer be a multiple of the word size.
+ * Data in the buffer after `length` will be overwritten only with the same
+ * values that were originally present.
+ *
+ * word_mask returns a copy of prepared_key circularly shifted based on the
+ * length value. The returned value may be fed back into byte_mask when more
+ * data is available.
+ *
+ * @param data Character buffer to mask
+ *
+ * @param length Length of data
+ *
+ * @param prepared_key Prepared key to use.
+ *
+ * @return the prepared_key shifted to account for the input length
+ */
+inline size_t byte_mask_circ(uint8_t * input, uint8_t * output, size_t length,
+    size_t prepared_key)
+{
+    uint32_converter key;
+    key.i = prepared_key;
+
+    for (size_t i = 0; i < length; ++i) {
+        output[i] = input[i] ^ key.c[i % 4];
+    }
+
+    return circshift_prepared_key(prepared_key,length % 4);
+}
+
+/// Circular byte aligned mask/unmask (in place)
+/**
+ * In place version of byte_mask_circ
+ *
+ * @see byte_mask_circ
+ *
+ * @param data Character buffer to read from and write to
+ *
+ * @param length Length of data
+ *
+ * @param prepared_key Prepared key to use.
+ *
+ * @return the prepared_key shifted to account for the input length
+ */
+inline size_t byte_mask_circ(uint8_t* data, size_t length, size_t prepared_key){
+    return byte_mask_circ(data,data,length,prepared_key);
+}
+
+} // namespace frame
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_FRAME_HPP
diff --git a/vendor/websocketpp/websocketpp/http/constants.hpp b/vendor/websocketpp/websocketpp/http/constants.hpp
new file mode 100644
index 0000000..f946cb3
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/http/constants.hpp
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef HTTP_CONSTANTS_HPP
+#define HTTP_CONSTANTS_HPP
+
+#include <exception>
+#include <map>
+#include <string>
+#include <vector>
+#include <utility>
+
+namespace websocketpp {
+/// HTTP handling support
+namespace http {
+    /// The type of an HTTP attribute list
+    /**
+     * The attribute list is an unordered key/value map. Encoded attribute
+     * values are delimited by semicolons.
+     */
+    typedef std::map<std::string,std::string> attribute_list;
+
+    /// The type of an HTTP parameter list
+    /**
+     * The parameter list is an ordered pairing of a parameter and its
+     * associated attribute list. Encoded parameter values are delimited by
+     * commas.
+     */
+    typedef std::vector< std::pair<std::string,attribute_list> > parameter_list;
+
+    /// Literal value of the HTTP header delimiter
+    static char const header_delimiter[] = "\r\n";
+
+    /// Literal value of the HTTP header separator
+    static char const header_separator[] = ":";
+
+    /// Literal value of an empty header
+    static std::string const empty_header;
+
+    /// Maximum size in bytes before rejecting an HTTP header as too big.
+    size_t const max_header_size = 16000;
+    
+    /// Default Maximum size in bytes for HTTP message bodies.
+    size_t const max_body_size = 32000000;
+
+    /// Number of bytes to use for temporary istream read buffers
+    size_t const istream_buffer = 512;
+
+    /// invalid HTTP token characters
+    /**
+     * 0x00 - 0x32, 0x7f-0xff
+     * ( ) < > @ , ; : \ " / [ ] ? = { }
+     */
+    static char const header_token[] = {
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..0f
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 10..1f
+        0,1,0,1,1,1,1,1,0,0,1,1,0,1,1,0, // 20..2f
+        1,1,1,1,1,1,1,1,1,1,0,0,0,0,0,0, // 30..3f
+        0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 40..4f
+        1,1,1,1,1,1,1,1,1,1,1,0,0,0,1,1, // 50..5f
+        1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // 60..6f
+        1,1,1,1,1,1,1,1,1,1,1,0,1,0,1,0, // 70..7f
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 80..8f
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 90..9f
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // a0..af
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // b0..bf
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // c0..cf
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // d0..df
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // e0..ef
+        0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // f0..ff
+    };
+
+    /// Is the character a token
+    inline bool is_token_char(unsigned char c) {
+        return (header_token[c] == 1);
+    }
+
+    /// Is the character a non-token
+    inline bool is_not_token_char(unsigned char c) {
+        return !header_token[c];
+    }
+
+    /// Is the character whitespace
+    /**
+     * whitespace is space (32) or horizontal tab (9)
+     */
+    inline bool is_whitespace_char(unsigned char c) {
+        return (c == 9 || c == 32);
+    }
+
+    /// Is the character non-whitespace
+    inline bool is_not_whitespace_char(unsigned char c) {
+        return (c != 9 && c != 32);
+    }
+
+    /// HTTP Status codes
+    namespace status_code {
+        enum value {
+            uninitialized = 0,
+
+            continue_code = 100,
+            switching_protocols = 101,
+
+            ok = 200,
+            created = 201,
+            accepted = 202,
+            non_authoritative_information = 203,
+            no_content = 204,
+            reset_content = 205,
+            partial_content = 206,
+
+            multiple_choices = 300,
+            moved_permanently = 301,
+            found = 302,
+            see_other = 303,
+            not_modified = 304,
+            use_proxy = 305,
+            temporary_redirect = 307,
+
+            bad_request = 400,
+            unauthorized = 401,
+            payment_required = 402,
+            forbidden = 403,
+            not_found = 404,
+            method_not_allowed = 405,
+            not_acceptable = 406,
+            proxy_authentication_required = 407,
+            request_timeout = 408,
+            conflict = 409,
+            gone = 410,
+            length_required = 411,
+            precondition_failed = 412,
+            request_entity_too_large = 413,
+            request_uri_too_long = 414,
+            unsupported_media_type = 415,
+            request_range_not_satisfiable = 416,
+            expectation_failed = 417,
+            im_a_teapot = 418,
+            upgrade_required = 426,
+            precondition_required = 428,
+            too_many_requests = 429,
+            request_header_fields_too_large = 431,
+
+            internal_server_error = 500,
+            not_implemented = 501,
+            bad_gateway = 502,
+            service_unavailable = 503,
+            gateway_timeout = 504,
+            http_version_not_supported = 505,
+            not_extended = 510,
+            network_authentication_required = 511
+        };
+
+        // TODO: should this be inline?
+        inline std::string get_string(value c) {
+            switch (c) {
+                case uninitialized:
+                    return "Uninitialized";
+                case continue_code:
+                    return "Continue";
+                case switching_protocols:
+                    return "Switching Protocols";
+                case ok:
+                    return "OK";
+                case created:
+                    return "Created";
+                case accepted:
+                    return "Accepted";
+                case non_authoritative_information:
+                    return "Non Authoritative Information";
+                case no_content:
+                    return "No Content";
+                case reset_content:
+                    return "Reset Content";
+                case partial_content:
+                    return "Partial Content";
+                case multiple_choices:
+                    return "Multiple Choices";
+                case moved_permanently:
+                    return "Moved Permanently";
+                case found:
+                    return "Found";
+                case see_other:
+                    return "See Other";
+                case not_modified:
+                    return "Not Modified";
+                case use_proxy:
+                    return "Use Proxy";
+                case temporary_redirect:
+                    return "Temporary Redirect";
+                case bad_request:
+                    return "Bad Request";
+                case unauthorized:
+                    return "Unauthorized";
+                case payment_required:
+                    return "Payment Required";
+                case forbidden:
+                    return "Forbidden";
+                case not_found:
+                    return "Not Found";
+                case method_not_allowed:
+                    return "Method Not Allowed";
+                case not_acceptable:
+                    return "Not Acceptable";
+                case proxy_authentication_required:
+                    return "Proxy Authentication Required";
+                case request_timeout:
+                    return "Request Timeout";
+                case conflict:
+                    return "Conflict";
+                case gone:
+                    return "Gone";
+                case length_required:
+                    return "Length Required";
+                case precondition_failed:
+                    return "Precondition Failed";
+                case request_entity_too_large:
+                    return "Request Entity Too Large";
+                case request_uri_too_long:
+                    return "Request-URI Too Long";
+                case unsupported_media_type:
+                    return "Unsupported Media Type";
+                case request_range_not_satisfiable:
+                    return "Requested Range Not Satisfiable";
+                case expectation_failed:
+                    return "Expectation Failed";
+                case im_a_teapot:
+                    return "I'm a teapot";
+                case upgrade_required:
+                    return "Upgrade Required";
+                case precondition_required:
+                    return "Precondition Required";
+                case too_many_requests:
+                    return "Too Many Requests";
+                case request_header_fields_too_large:
+                    return "Request Header Fields Too Large";
+                case internal_server_error:
+                    return "Internal Server Error";
+                case not_implemented:
+                    return "Not Implemented";
+                case bad_gateway:
+                    return "Bad Gateway";
+                case service_unavailable:
+                    return "Service Unavailable";
+                case gateway_timeout:
+                    return "Gateway Timeout";
+                case http_version_not_supported:
+                    return "HTTP Version Not Supported";
+                case not_extended:
+                    return "Not Extended";
+                case network_authentication_required:
+                    return "Network Authentication Required";
+                default:
+                    return "Unknown";
+            }
+        }
+    }
+
+    class exception : public std::exception {
+    public:
+        exception(const std::string& log_msg,
+                  status_code::value error_code,
+                  const std::string& error_msg = std::string(),
+                  const std::string& body = std::string())
+          : m_msg(log_msg)
+          , m_error_msg(error_msg)
+          , m_body(body)
+          , m_error_code(error_code) {}
+
+        ~exception() throw() {}
+
+        virtual const char* what() const throw() {
+            return m_msg.c_str();
+        }
+
+        std::string         m_msg;
+        std::string         m_error_msg;
+        std::string         m_body;
+        status_code::value  m_error_code;
+    };
+}
+}
+
+#endif // HTTP_CONSTANTS_HPP
diff --git a/vendor/websocketpp/websocketpp/http/impl/parser.hpp b/vendor/websocketpp/websocketpp/http/impl/parser.hpp
new file mode 100644
index 0000000..1d59b93
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/http/impl/parser.hpp
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef HTTP_PARSER_IMPL_HPP
+#define HTTP_PARSER_IMPL_HPP
+
+#include <algorithm>
+#include <cstdlib>
+#include <istream>
+#include <sstream>
+#include <string>
+
+namespace websocketpp {
+namespace http {
+namespace parser {
+
+inline void parser::set_version(std::string const & version) {
+    m_version = version;
+}
+
+inline std::string const & parser::get_header(std::string const & key) const {
+    header_list::const_iterator h = m_headers.find(key);
+
+    if (h == m_headers.end()) {
+        return empty_header;
+    } else {
+        return h->second;
+    }
+}
+
+inline bool parser::get_header_as_plist(std::string const & key,
+    parameter_list & out) const
+{
+    header_list::const_iterator it = m_headers.find(key);
+
+    if (it == m_headers.end() || it->second.size() == 0) {
+        return false;
+    }
+
+    return this->parse_parameter_list(it->second,out);
+}
+
+inline void parser::append_header(std::string const & key, std::string const &
+    val)
+{
+    if (std::find_if(key.begin(),key.end(),is_not_token_char) != key.end()) {
+        throw exception("Invalid header name",status_code::bad_request);
+    }
+
+    if (this->get_header(key).empty()) {
+        m_headers[key] = val;
+    } else {
+        m_headers[key] += ", " + val;
+    }
+}
+
+inline void parser::replace_header(std::string const & key, std::string const &
+    val)
+{
+    m_headers[key] = val;
+}
+
+inline void parser::remove_header(std::string const & key) {
+    m_headers.erase(key);
+}
+
+inline void parser::set_body(std::string const & value) {
+    if (value.size() == 0) {
+        remove_header("Content-Length");
+        m_body.clear();
+        return;
+    }
+
+    // TODO: should this method respect the max size? If so how should errors
+    // be indicated?
+
+    std::stringstream len;
+    len << value.size();
+    replace_header("Content-Length", len.str());
+    m_body = value;
+}
+
+inline bool parser::parse_parameter_list(std::string const & in,
+    parameter_list & out) const
+{
+    if (in.size() == 0) {
+        return false;
+    }
+
+    std::string::const_iterator it;
+    it = extract_parameters(in.begin(),in.end(),out);
+    return (it == in.begin());
+}
+
+inline bool parser::prepare_body() {
+    if (!get_header("Content-Length").empty()) {
+        std::string const & cl_header = get_header("Content-Length");
+        char * end;
+        
+        // TODO: not 100% sure what the compatibility of this method is. Also,
+        // I believe this will only work up to 32bit sizes. Is there a need for
+        // > 4GiB HTTP payloads?
+        m_body_bytes_needed = std::strtoul(cl_header.c_str(),&end,10);
+        
+        if (m_body_bytes_needed > m_body_bytes_max) {
+            throw exception("HTTP message body too large",
+                status_code::request_entity_too_large);
+        }
+        
+        m_body_encoding = body_encoding::plain;
+        return true;
+    } else if (get_header("Transfer-Encoding") == "chunked") {
+        // TODO
+        //m_body_encoding = body_encoding::chunked;
+        return false;
+    } else {
+        return false;
+    }
+}
+
+inline size_t parser::process_body(char const * buf, size_t len) {
+    if (m_body_encoding == body_encoding::plain) {
+        size_t processed = (std::min)(m_body_bytes_needed,len);
+        m_body.append(buf,processed);
+        m_body_bytes_needed -= processed;
+        return processed;
+    } else if (m_body_encoding == body_encoding::chunked) {
+        // TODO: 
+        throw exception("Unexpected body encoding",
+            status_code::internal_server_error);
+    } else {
+        throw exception("Unexpected body encoding",
+            status_code::internal_server_error);
+    }
+}
+
+inline void parser::process_header(std::string::iterator begin,
+    std::string::iterator end)
+{
+    std::string::iterator cursor = std::search(
+        begin,
+        end,
+        header_separator,
+        header_separator + sizeof(header_separator) - 1
+    );
+
+    if (cursor == end) {
+        throw exception("Invalid header line",status_code::bad_request);
+    }
+
+    append_header(strip_lws(std::string(begin,cursor)),
+                  strip_lws(std::string(cursor+sizeof(header_separator)-1,end)));
+}
+
+inline std::string parser::raw_headers() const {
+    std::stringstream raw;
+
+    header_list::const_iterator it;
+    for (it = m_headers.begin(); it != m_headers.end(); it++) {
+        raw << it->first << ": " << it->second << "\r\n";
+    }
+
+    return raw.str();
+}
+
+
+
+} // namespace parser
+} // namespace http
+} // namespace websocketpp
+
+#endif // HTTP_PARSER_IMPL_HPP
diff --git a/vendor/websocketpp/websocketpp/http/impl/request.hpp b/vendor/websocketpp/websocketpp/http/impl/request.hpp
new file mode 100644
index 0000000..311a620
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/http/impl/request.hpp
@@ -0,0 +1,191 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef HTTP_PARSER_REQUEST_IMPL_HPP
+#define HTTP_PARSER_REQUEST_IMPL_HPP
+
+#include <algorithm>
+#include <sstream>
+#include <string>
+
+#include <websocketpp/http/parser.hpp>
+
+namespace websocketpp {
+namespace http {
+namespace parser {
+
+inline size_t request::consume(char const * buf, size_t len) {
+    size_t bytes_processed;
+    
+    if (m_ready) {return 0;}
+    
+    if (m_body_bytes_needed > 0) {
+        bytes_processed = process_body(buf,len);
+        if (body_ready()) {
+            m_ready = true;
+        }
+        return bytes_processed;
+    }
+
+    // copy new header bytes into buffer
+    m_buf->append(buf,len);
+
+    // Search for delimiter in buf. If found read until then. If not read all
+    std::string::iterator begin = m_buf->begin();
+    std::string::iterator end;
+
+    for (;;) {
+        // search for line delimiter
+        end = std::search(
+            begin,
+            m_buf->end(),
+            header_delimiter,
+            header_delimiter+sizeof(header_delimiter)-1
+        );
+        
+        m_header_bytes += (end-begin+sizeof(header_delimiter));
+        
+        if (m_header_bytes > max_header_size) {
+            // exceeded max header size
+            throw exception("Maximum header size exceeded.",
+                status_code::request_header_fields_too_large);
+        }
+
+        if (end == m_buf->end()) {
+            // we are out of bytes. Discard the processed bytes and copy the
+            // remaining unprecessed bytes to the beginning of the buffer
+            std::copy(begin,end,m_buf->begin());
+            m_buf->resize(static_cast<std::string::size_type>(end-begin));
+            m_header_bytes -= m_buf->size();
+
+            return len;
+        }
+
+        //the range [begin,end) now represents a line to be processed.
+        if (end-begin == 0) {
+            // we got a blank line
+            if (m_method.empty() || get_header("Host").empty()) {
+                throw exception("Incomplete Request",status_code::bad_request);
+            }
+
+            bytes_processed = (
+                len - static_cast<std::string::size_type>(m_buf->end()-end)
+                    + sizeof(header_delimiter) - 1
+            );
+
+            // frees memory used temporarily during request parsing
+            m_buf.reset();
+
+            // if this was not an upgrade request and has a content length
+            // continue capturing content-length bytes and expose them as a 
+            // request body.
+            
+            if (prepare_body()) {
+                bytes_processed += process_body(buf+bytes_processed,len-bytes_processed);
+                if (body_ready()) {
+                    m_ready = true;
+                }
+                return bytes_processed;
+            } else {
+                m_ready = true;
+
+                // return number of bytes processed (starting bytes - bytes left)
+                return bytes_processed;
+            }
+        } else {
+            if (m_method.empty()) {
+                this->process(begin,end);
+            } else {
+                this->process_header(begin,end);
+            }
+        }
+
+        begin = end+(sizeof(header_delimiter)-1);
+    }
+}
+
+inline std::string request::raw() const {
+    // TODO: validation. Make sure all required fields have been set?
+    std::stringstream ret;
+
+    ret << m_method << " " << m_uri << " " << get_version() << "\r\n";
+    ret << raw_headers() << "\r\n" << m_body;
+
+    return ret.str();
+}
+
+inline std::string request::raw_head() const {
+    // TODO: validation. Make sure all required fields have been set?
+    std::stringstream ret;
+
+    ret << m_method << " " << m_uri << " " << get_version() << "\r\n";
+    ret << raw_headers() << "\r\n";
+
+    return ret.str();
+}
+
+inline void request::set_method(std::string const & method) {
+    if (std::find_if(method.begin(),method.end(),is_not_token_char) != method.end()) {
+        throw exception("Invalid method token.",status_code::bad_request);
+    }
+
+    m_method = method;
+}
+
+inline void request::set_uri(std::string const & uri) {
+    // TODO: validation?
+    m_uri = uri;
+}
+
+inline void request::process(std::string::iterator begin, std::string::iterator
+    end)
+{
+    std::string::iterator cursor_start = begin;
+    std::string::iterator cursor_end = std::find(begin,end,' ');
+
+    if (cursor_end == end) {
+        throw exception("Invalid request line1",status_code::bad_request);
+    }
+
+    set_method(std::string(cursor_start,cursor_end));
+
+    cursor_start = cursor_end+1;
+    cursor_end = std::find(cursor_start,end,' ');
+
+    if (cursor_end == end) {
+        throw exception("Invalid request line2",status_code::bad_request);
+    }
+
+    set_uri(std::string(cursor_start,cursor_end));
+    set_version(std::string(cursor_end+1,end));
+}
+
+} // namespace parser
+} // namespace http
+} // namespace websocketpp
+
+#endif // HTTP_PARSER_REQUEST_IMPL_HPP
diff --git a/vendor/websocketpp/websocketpp/http/impl/response.hpp b/vendor/websocketpp/websocketpp/http/impl/response.hpp
new file mode 100644
index 0000000..4400cda
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/http/impl/response.hpp
@@ -0,0 +1,266 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef HTTP_PARSER_RESPONSE_IMPL_HPP
+#define HTTP_PARSER_RESPONSE_IMPL_HPP
+
+#include <algorithm>
+#include <istream>
+#include <sstream>
+#include <string>
+
+#include <websocketpp/http/parser.hpp>
+
+namespace websocketpp {
+namespace http {
+namespace parser {
+
+inline size_t response::consume(char const * buf, size_t len) {
+    if (m_state == DONE) {return 0;}
+
+    if (m_state == BODY) {
+        return this->process_body(buf,len);
+    }
+
+    // copy new header bytes into buffer
+    m_buf->append(buf,len);
+
+    // Search for delimiter in buf. If found read until then. If not read all
+    std::string::iterator begin = m_buf->begin();
+    std::string::iterator end = begin;
+
+
+    for (;;) {
+        // search for delimiter
+        end = std::search(
+            begin,
+            m_buf->end(),
+            header_delimiter,
+            header_delimiter + sizeof(header_delimiter) - 1
+        );
+
+        m_header_bytes += (end-begin+sizeof(header_delimiter));
+        
+        if (m_header_bytes > max_header_size) {
+            // exceeded max header size
+            throw exception("Maximum header size exceeded.",
+                status_code::request_header_fields_too_large);
+        }
+
+        if (end == m_buf->end()) {
+            // we are out of bytes. Discard the processed bytes and copy the
+            // remaining unprecessed bytes to the beginning of the buffer
+            std::copy(begin,end,m_buf->begin());
+            m_buf->resize(static_cast<std::string::size_type>(end-begin));
+
+            m_read += len;
+            m_header_bytes -= m_buf->size();
+
+            return len;
+        }
+
+        //the range [begin,end) now represents a line to be processed.
+
+        if (end-begin == 0) {
+            // we got a blank line
+            if (m_state == RESPONSE_LINE) {
+                throw exception("Incomplete Request",status_code::bad_request);
+            }
+
+            // TODO: grab content-length
+            std::string length = get_header("Content-Length");
+
+            if (length.empty()) {
+                // no content length found, read indefinitely
+                m_read = 0;
+            } else {
+                std::istringstream ss(length);
+
+                if ((ss >> m_read).fail()) {
+                    throw exception("Unable to parse Content-Length header",
+                                    status_code::bad_request);
+                }
+            }
+
+            m_state = BODY;
+
+            // calc header bytes processed (starting bytes - bytes left)
+            size_t read = (
+                len - static_cast<std::string::size_type>(m_buf->end() - end)
+                + sizeof(header_delimiter) - 1
+            );
+
+            // if there were bytes left process them as body bytes
+            if (read < len) {
+                read += this->process_body(buf+read,(len-read));
+            }
+
+            // frees memory used temporarily during header parsing
+            m_buf.reset();
+
+            return read;
+        } else {
+            if (m_state == RESPONSE_LINE) {
+                this->process(begin,end);
+                m_state = HEADERS;
+            } else {
+                this->process_header(begin,end);
+            }
+        }
+
+        begin = end+(sizeof(header_delimiter) - 1);
+    }
+}
+
+inline size_t response::consume(std::istream & s) {
+    char buf[istream_buffer];
+    size_t bytes_read;
+    size_t bytes_processed;
+    size_t total = 0;
+
+    while (s.good()) {
+        s.getline(buf,istream_buffer);
+        bytes_read = static_cast<size_t>(s.gcount());
+
+        if (s.fail() || s.eof()) {
+            bytes_processed = this->consume(buf,bytes_read);
+            total += bytes_processed;
+
+            if (bytes_processed != bytes_read) {
+                // problem
+                break;
+            }
+        } else if (s.bad()) {
+            // problem
+            break;
+        } else {
+            // the delimiting newline was found. Replace the trailing null with
+            // the newline that was discarded, since our raw consume function
+            // expects the newline to be be there.
+            buf[bytes_read-1] = '\n';
+            bytes_processed = this->consume(buf,bytes_read);
+            total += bytes_processed;
+
+            if (bytes_processed != bytes_read) {
+                // problem
+                break;
+            }
+        }
+    }
+
+    return total;
+}
+
+inline std::string response::raw() const {
+    // TODO: validation. Make sure all required fields have been set?
+
+    std::stringstream ret;
+
+    ret << get_version() << " " << m_status_code << " " << m_status_msg;
+    ret << "\r\n" << raw_headers() << "\r\n";
+
+    ret << m_body;
+
+    return ret.str();
+}
+
+inline void response::set_status(status_code::value code) {
+    // TODO: validation?
+    m_status_code = code;
+    m_status_msg = get_string(code);
+}
+
+inline void response::set_status(status_code::value code, std::string const &
+    msg)
+{
+    // TODO: validation?
+    m_status_code = code;
+    m_status_msg = msg;
+}
+
+inline void response::process(std::string::iterator begin,
+    std::string::iterator end)
+{
+    std::string::iterator cursor_start = begin;
+    std::string::iterator cursor_end = std::find(begin,end,' ');
+
+    if (cursor_end == end) {
+        throw exception("Invalid response line",status_code::bad_request);
+    }
+
+    set_version(std::string(cursor_start,cursor_end));
+
+    cursor_start = cursor_end+1;
+    cursor_end = std::find(cursor_start,end,' ');
+
+    if (cursor_end == end) {
+        throw exception("Invalid request line",status_code::bad_request);
+    }
+
+    int code;
+
+    std::istringstream ss(std::string(cursor_start,cursor_end));
+
+    if ((ss >> code).fail()) {
+        throw exception("Unable to parse response code",status_code::bad_request);
+    }
+
+    set_status(status_code::value(code),std::string(cursor_end+1,end));
+}
+
+inline size_t response::process_body(char const * buf, size_t len) {
+    // If no content length was set then we read forever and never set m_ready
+    if (m_read == 0) {
+        //m_body.append(buf,len);
+        //return len;
+        m_state = DONE;
+        return 0;
+    }
+
+    // Otherwise m_read is the number of bytes left.
+    size_t to_read;
+
+    if (len >= m_read) {
+        // if we have more bytes than we need read, read only the amount needed
+        // then set done state
+        to_read = m_read;
+        m_state = DONE;
+    } else {
+        // we need more bytes than are available, read them all
+        to_read = len;
+    }
+
+    m_body.append(buf,to_read);
+    m_read -= to_read;
+    return to_read;
+}
+
+} // namespace parser
+} // namespace http
+} // namespace websocketpp
+
+#endif // HTTP_PARSER_RESPONSE_IMPL_HPP
diff --git a/vendor/websocketpp/websocketpp/http/parser.hpp b/vendor/websocketpp/websocketpp/http/parser.hpp
new file mode 100644
index 0000000..90f49eb
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/http/parser.hpp
@@ -0,0 +1,619 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef HTTP_PARSER_HPP
+#define HTTP_PARSER_HPP
+
+#include <algorithm>
+#include <map>
+#include <string>
+#include <utility>
+
+#include <websocketpp/utilities.hpp>
+#include <websocketpp/http/constants.hpp>
+
+namespace websocketpp {
+namespace http {
+namespace parser {
+
+namespace state {
+    enum value {
+        method,
+        resource,
+        version,
+        headers
+    };
+}
+
+namespace body_encoding {
+    enum value {
+        unknown,
+        plain,
+        chunked
+    };
+}
+
+typedef std::map<std::string, std::string, utility::ci_less > header_list;
+
+/// Read and return the next token in the stream
+/**
+ * Read until a non-token character is found and then return the token and
+ * iterator to the next character to read
+ *
+ * @param begin An iterator to the beginning of the sequence
+ * @param end An iterator to the end of the sequence
+ * @return A pair containing the token and an iterator to the next character in
+ * the stream
+ */
+template <typename InputIterator>
+std::pair<std::string,InputIterator> extract_token(InputIterator begin,
+    InputIterator end)
+{
+    InputIterator it = std::find_if(begin,end,&is_not_token_char);
+    return std::make_pair(std::string(begin,it),it);
+}
+
+/// Read and return the next quoted string in the stream
+/**
+ * Read a double quoted string starting at `begin`. The quotes themselves are
+ * stripped. The quoted value is returned along with an iterator to the next
+ * character to read
+ *
+ * @param begin An iterator to the beginning of the sequence
+ * @param end An iterator to the end of the sequence
+ * @return A pair containing the string read and an iterator to the next
+ * character in the stream
+ */
+template <typename InputIterator>
+std::pair<std::string,InputIterator> extract_quoted_string(InputIterator begin,
+    InputIterator end)
+{
+    std::string s;
+
+    if (end == begin) {
+        return std::make_pair(s,begin);
+    }
+
+    if (*begin != '"') {
+        return std::make_pair(s,begin);
+    }
+
+    InputIterator cursor = begin+1;
+    InputIterator marker = cursor;
+
+    cursor = std::find(cursor,end,'"');
+
+    while (cursor != end) {
+        // either this is the end or a quoted string
+        if (*(cursor-1) == '\\') {
+            s.append(marker,cursor-1);
+            s.append(1,'"');
+            ++cursor;
+            marker = cursor;
+        } else {
+            s.append(marker,cursor);
+            ++cursor;
+            return std::make_pair(s,cursor);
+        }
+
+        cursor = std::find(cursor,end,'"');
+    }
+
+    return std::make_pair("",begin);
+}
+
+/// Read and discard one unit of linear whitespace
+/**
+ * Read one unit of linear white space and return the iterator to the character
+ * afterwards. If `begin` is returned, no whitespace was extracted.
+ *
+ * @param begin An iterator to the beginning of the sequence
+ * @param end An iterator to the end of the sequence
+ * @return An iterator to the character after the linear whitespace read
+ */
+template <typename InputIterator>
+InputIterator extract_lws(InputIterator begin, InputIterator end) {
+    InputIterator it = begin;
+
+    // strip leading CRLF
+    if (end-begin > 2 && *begin == '\r' && *(begin+1) == '\n' &&
+        is_whitespace_char(static_cast<unsigned char>(*(begin+2))))
+    {
+        it+=3;
+    }
+
+    it = std::find_if(it,end,&is_not_whitespace_char);
+    return it;
+}
+
+/// Read and discard linear whitespace
+/**
+ * Read linear white space until a non-lws character is read and return an
+ * iterator to that character. If `begin` is returned, no whitespace was
+ * extracted.
+ *
+ * @param begin An iterator to the beginning of the sequence
+ * @param end An iterator to the end of the sequence
+ * @return An iterator to the character after the linear whitespace read
+ */
+template <typename InputIterator>
+InputIterator extract_all_lws(InputIterator begin, InputIterator end) {
+    InputIterator old_it;
+    InputIterator new_it = begin;
+
+    do {
+        // Pull value from previous iteration
+        old_it = new_it;
+
+        // look ahead another pass
+        new_it = extract_lws(old_it,end);
+    } while (new_it != end && old_it != new_it);
+
+    return new_it;
+}
+
+/// Extract HTTP attributes
+/**
+ * An http attributes list is a semicolon delimited list of key value pairs in
+ * the format: *( ";" attribute "=" value ) where attribute is a token and value
+ * is a token or quoted string.
+ *
+ * Attributes extracted are appended to the supplied attributes list
+ * `attributes`.
+ *
+ * @param [in] begin An iterator to the beginning of the sequence
+ * @param [in] end An iterator to the end of the sequence
+ * @param [out] attributes A reference to the attributes list to append
+ * attribute/value pairs extracted to
+ * @return An iterator to the character after the last atribute read
+ */
+template <typename InputIterator>
+InputIterator extract_attributes(InputIterator begin, InputIterator end,
+    attribute_list & attributes)
+{
+    InputIterator cursor;
+    bool first = true;
+
+    if (begin == end) {
+        return begin;
+    }
+
+    cursor = begin;
+    std::pair<std::string,InputIterator> ret;
+
+    while (cursor != end) {
+        std::string name;
+
+        cursor = http::parser::extract_all_lws(cursor,end);
+        if (cursor == end) {
+            break;
+        }
+
+        if (first) {
+            // ignore this check for the very first pass
+            first = false;
+        } else {
+            if (*cursor == ';') {
+                // advance past the ';'
+                ++cursor;
+            } else {
+                // non-semicolon in this position indicates end end of the
+                // attribute list, break and return.
+                break;
+            }
+        }
+
+        cursor = http::parser::extract_all_lws(cursor,end);
+        ret = http::parser::extract_token(cursor,end);
+
+        if (ret.first.empty()) {
+            // error: expected a token
+            return begin;
+        } else {
+            name = ret.first;
+            cursor = ret.second;
+        }
+
+        cursor = http::parser::extract_all_lws(cursor,end);
+        if (cursor == end || *cursor != '=') {
+            // if there is an equals sign, read the attribute value. Otherwise
+            // record a blank value and continue
+            attributes[name].clear();
+            continue;
+        }
+
+        // advance past the '='
+        ++cursor;
+
+        cursor = http::parser::extract_all_lws(cursor,end);
+        if (cursor == end) {
+            // error: expected a token or quoted string
+            return begin;
+        }
+
+        ret = http::parser::extract_quoted_string(cursor,end);
+        if (ret.second != cursor) {
+            attributes[name] = ret.first;
+            cursor = ret.second;
+            continue;
+        }
+
+        ret = http::parser::extract_token(cursor,end);
+        if (ret.first.empty()) {
+            // error : expected token or quoted string
+            return begin;
+        } else {
+            attributes[name] = ret.first;
+            cursor = ret.second;
+        }
+    }
+
+    return cursor;
+}
+
+/// Extract HTTP parameters
+/**
+ * An http parameters list is a comma delimited list of tokens followed by
+ * optional semicolon delimited attributes lists.
+ *
+ * Parameters extracted are appended to the supplied parameters list
+ * `parameters`.
+ *
+ * @param [in] begin An iterator to the beginning of the sequence
+ * @param [in] end An iterator to the end of the sequence
+ * @param [out] parameters A reference to the parameters list to append
+ * paramter values extracted to
+ * @return An iterator to the character after the last parameter read
+ */
+template <typename InputIterator>
+InputIterator extract_parameters(InputIterator begin, InputIterator end,
+    parameter_list &parameters)
+{
+    InputIterator cursor;
+
+    if (begin == end) {
+        // error: expected non-zero length range
+        return begin;
+    }
+
+    cursor = begin;
+    std::pair<std::string,InputIterator> ret;
+
+    /**
+     * LWS
+     * token
+     * LWS
+     * *(";" method-param)
+     * LWS
+     * ,=loop again
+     */
+    while (cursor != end) {
+        std::string parameter_name;
+        attribute_list attributes;
+
+        // extract any stray whitespace
+        cursor = http::parser::extract_all_lws(cursor,end);
+        if (cursor == end) {break;}
+
+        ret = http::parser::extract_token(cursor,end);
+
+        if (ret.first.empty()) {
+            // error: expected a token
+            return begin;
+        } else {
+            parameter_name = ret.first;
+            cursor = ret.second;
+        }
+
+        // Safe break point, insert parameter with blank attributes and exit
+        cursor = http::parser::extract_all_lws(cursor,end);
+        if (cursor == end) {
+            //parameters[parameter_name] = attributes;
+            parameters.push_back(std::make_pair(parameter_name,attributes));
+            break;
+        }
+
+        // If there is an attribute list, read it in
+        if (*cursor == ';') {
+            InputIterator acursor;
+
+            ++cursor;
+            acursor = http::parser::extract_attributes(cursor,end,attributes);
+
+            if (acursor == cursor) {
+                // attribute extraction ended in syntax error
+                return begin;
+            }
+
+            cursor = acursor;
+        }
+
+        // insert parameter into output list
+        //parameters[parameter_name] = attributes;
+        parameters.push_back(std::make_pair(parameter_name,attributes));
+
+        cursor = http::parser::extract_all_lws(cursor,end);
+        if (cursor == end) {break;}
+
+        // if next char is ',' then read another parameter, else stop
+        if (*cursor != ',') {
+            break;
+        }
+
+        // advance past comma
+        ++cursor;
+
+        if (cursor == end) {
+            // expected more bytes after a comma
+            return begin;
+        }
+    }
+
+    return cursor;
+}
+
+inline std::string strip_lws(std::string const & input) {
+    std::string::const_iterator begin = extract_all_lws(input.begin(),input.end());
+    if (begin == input.end()) {
+        return std::string();
+    }
+
+    std::string::const_reverse_iterator rbegin = extract_all_lws(input.rbegin(),input.rend());
+    if (rbegin == input.rend()) {
+        return std::string();
+    }
+
+    return std::string(begin,rbegin.base());
+}
+
+/// Base HTTP parser
+/**
+ * Includes methods and data elements common to all types of HTTP messages such
+ * as headers, versions, bodies, etc.
+ */
+class parser {
+public:
+    parser()
+      : m_header_bytes(0)
+      , m_body_bytes_needed(0)
+      , m_body_bytes_max(max_body_size)
+      , m_body_encoding(body_encoding::unknown) {}
+    
+    /// Get the HTTP version string
+    /**
+     * @return The version string for this parser
+     */
+    std::string const & get_version() const {
+        return m_version;
+    }
+
+    /// Set HTTP parser Version
+    /**
+     * Input should be in format: HTTP/x.y where x and y are positive integers.
+     * @todo Does this method need any validation?
+     *
+     * @param [in] version The value to set the HTTP version to.
+     */
+    void set_version(std::string const & version);
+
+    /// Get the value of an HTTP header
+    /**
+     * @todo Make this method case insensitive.
+     *
+     * @param [in] key The name/key of the header to get.
+     * @return The value associated with the given HTTP header key.
+     */
+    std::string const & get_header(std::string const & key) const;
+
+    /// Extract an HTTP parameter list from a parser header.
+    /**
+     * If the header requested doesn't exist or exists and is empty the
+     * parameter list is valid (but empty).
+     *
+     * @param [in] key The name/key of the HTTP header to use as input.
+     * @param [out] out The parameter list to store extracted parameters in.
+     * @return Whether or not the input was a valid parameter list.
+     */
+    bool get_header_as_plist(std::string const & key, parameter_list & out)
+        const;
+
+    /// Append a value to an existing HTTP header
+    /**
+     * This method will set the value of the HTTP header `key` with the
+     * indicated value. If a header with the name `key` already exists, `val`
+     * will be appended to the existing value.
+     *
+     * @todo Make this method case insensitive.
+     * @todo Should there be any restrictions on which keys are allowed?
+     * @todo Exception free varient
+     *
+     * @see replace_header
+     *
+     * @param [in] key The name/key of the header to append to.
+     * @param [in] val The value to append.
+     */
+    void append_header(std::string const & key, std::string const & val);
+
+    /// Set a value for an HTTP header, replacing an existing value
+    /**
+     * This method will set the value of the HTTP header `key` with the
+     * indicated value. If a header with the name `key` already exists, `val`
+     * will replace the existing value.
+     *
+     * @todo Make this method case insensitive.
+     * @todo Should there be any restrictions on which keys are allowed?
+     * @todo Exception free varient
+     *
+     * @see append_header
+     *
+     * @param [in] key The name/key of the header to append to.
+     * @param [in] val The value to append.
+     */
+    void replace_header(std::string const & key, std::string const & val);
+
+    /// Remove a header from the parser
+    /**
+     * Removes the header entirely from the parser. This is different than
+     * setting the value of the header to blank.
+     *
+     * @todo Make this method case insensitive.
+     *
+     * @param [in] key The name/key of the header to remove.
+     */
+    void remove_header(std::string const & key);
+
+    /// Get HTTP body
+    /**
+     * Gets the body of the HTTP object
+     *
+     * @return The body of the HTTP message.
+     */
+    std::string const & get_body() const {
+        return m_body;
+    }
+
+    /// Set body content
+    /**
+     * Set the body content of the HTTP response to the parameter string. Note
+     * set_body will also set the Content-Length HTTP header to the appropriate
+     * value. If you want the Content-Length header to be something else, do so
+     * via replace_header("Content-Length") after calling set_body()
+     *
+     * @param value String data to include as the body content.
+     */
+    void set_body(std::string const & value);
+
+    /// Get body size limit
+    /**
+     * Retrieves the maximum number of bytes to parse & buffer before canceling
+     * a request.
+     *
+     * @since 0.5.0
+     *
+     * @return The maximum length of a message body.
+     */
+    size_t get_max_body_size() const {
+        return m_body_bytes_max;
+    }
+
+    /// Set body size limit
+    /**
+     * Set the maximum number of bytes to parse and buffer before canceling a
+     * request.
+     *
+     * @since 0.5.0
+     *
+     * @param value The size to set the max body length to.
+     */
+    void set_max_body_size(size_t value) {
+        m_body_bytes_max = value;
+    }
+
+    /// Extract an HTTP parameter list from a string.
+    /**
+     * @param [in] in The input string.
+     * @param [out] out The parameter list to store extracted parameters in.
+     * @return Whether or not the input was a valid parameter list.
+     */
+    bool parse_parameter_list(std::string const & in, parameter_list & out)
+        const;
+protected:
+    /// Process a header line
+    /**
+     * @todo Update this method to be exception free.
+     *
+     * @param [in] begin An iterator to the beginning of the sequence.
+     * @param [in] end An iterator to the end of the sequence.
+     */
+    void process_header(std::string::iterator begin, std::string::iterator end);
+
+    /// Prepare the parser to begin parsing body data
+    /**
+     * Inspects headers to determine if the message has a body that needs to be
+     * read. If so, sets up the necessary state, otherwise returns false. If
+     * this method returns true and loading the message body is desired call
+     * `process_body` until it returns zero bytes or an error.
+     *
+     * Must not be called until after all headers have been processed.
+     *
+     * @since 0.5.0
+     *
+     * @return True if more bytes are needed to load the body, false otherwise.
+     */
+    bool prepare_body();
+
+    /// Process body data
+    /**
+     * Parses body data.
+     *
+     * @since 0.5.0
+     *
+     * @param [in] begin An iterator to the beginning of the sequence.
+     * @param [in] end An iterator to the end of the sequence.
+     * @return The number of bytes processed
+     */
+    size_t process_body(char const * buf, size_t len);
+
+    /// Check if the parser is done parsing the body
+    /**
+     * Behavior before a call to `prepare_body` is undefined.
+     *
+     * @since 0.5.0
+     *
+     * @return True if the message body has been completed loaded.
+     */
+    bool body_ready() const {
+        return (m_body_bytes_needed == 0);
+    }
+
+    /// Generate and return the HTTP headers as a string
+    /**
+     * Each headers will be followed by the \r\n sequence including the last one.
+     * A second \r\n sequence (blank header) is not appended by this method
+     *
+     * @return The HTTP headers as a string.
+     */
+    std::string raw_headers() const;
+
+    std::string m_version;
+    header_list m_headers;
+    
+    size_t                  m_header_bytes;
+    
+    std::string             m_body;
+    size_t                  m_body_bytes_needed;
+    size_t                  m_body_bytes_max;
+    body_encoding::value    m_body_encoding;
+};
+
+} // namespace parser
+} // namespace http
+} // namespace websocketpp
+
+#include <websocketpp/http/impl/parser.hpp>
+
+#endif // HTTP_PARSER_HPP
diff --git a/vendor/websocketpp/websocketpp/http/request.hpp b/vendor/websocketpp/websocketpp/http/request.hpp
new file mode 100644
index 0000000..3355c99
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/http/request.hpp
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef HTTP_PARSER_REQUEST_HPP
+#define HTTP_PARSER_REQUEST_HPP
+
+#include <string>
+
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/http/parser.hpp>
+
+namespace websocketpp {
+namespace http {
+namespace parser {
+
+/// Stores, parses, and manipulates HTTP requests
+/**
+ * http::request provides the following functionality for working with HTTP
+ * requests.
+ *
+ * - Initialize request via manually setting each element
+ * - Initialize request via reading raw bytes and parsing
+ * - Once initialized, access individual parsed elements
+ * - Once initialized, read entire request as raw bytes
+ */
+class request : public parser {
+public:
+    typedef request type;
+    typedef lib::shared_ptr<type> ptr;
+
+    request()
+      : m_buf(lib::make_shared<std::string>())
+      , m_ready(false) {}
+
+    /// Process bytes in the input buffer
+    /**
+     * Process up to len bytes from input buffer buf. Returns the number of
+     * bytes processed. Bytes left unprocessed means bytes left over after the
+     * final header delimiters.
+     *
+     * Consume is a streaming processor. It may be called multiple times on one
+     * request and the full headers need not be available before processing can
+     * begin. If the end of the request was reached during this call to consume
+     * the ready flag will be set. Further calls to consume once ready will be
+     * ignored.
+     *
+     * Consume will throw an http::exception in the case of an error. Typical
+     * error reasons include malformed requests, incomplete requests, and max
+     * header size being reached.
+     *
+     * @param buf Pointer to byte buffer
+     * @param len Size of byte buffer
+     * @return Number of bytes processed.
+     */
+    size_t consume(char const * buf, size_t len);
+
+    /// Returns whether or not the request is ready for reading.
+    bool ready() const {
+        return m_ready;
+    }
+
+    /// Returns the full raw request (including the body)
+    std::string raw() const;
+    
+    /// Returns the raw request headers only (similar to an HTTP HEAD request)
+    std::string raw_head() const;
+
+    /// Set the HTTP method. Must be a valid HTTP token
+    void set_method(std::string const & method);
+
+    /// Return the request method
+    std::string const & get_method() const {
+        return m_method;
+    }
+
+    /// Set the HTTP uri. Must be a valid HTTP uri
+    void set_uri(std::string const & uri);
+
+    /// Return the requested URI
+    std::string const & get_uri() const {
+        return m_uri;
+    }
+
+private:
+    /// Helper function for message::consume. Process request line
+    void process(std::string::iterator begin, std::string::iterator end);
+
+    lib::shared_ptr<std::string>    m_buf;
+    std::string                     m_method;
+    std::string                     m_uri;
+    bool                            m_ready;
+};
+
+} // namespace parser
+} // namespace http
+} // namespace websocketpp
+
+#include <websocketpp/http/impl/request.hpp>
+
+#endif // HTTP_PARSER_REQUEST_HPP
diff --git a/vendor/websocketpp/websocketpp/http/response.hpp b/vendor/websocketpp/websocketpp/http/response.hpp
new file mode 100644
index 0000000..e724a3d
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/http/response.hpp
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef HTTP_PARSER_RESPONSE_HPP
+#define HTTP_PARSER_RESPONSE_HPP
+
+#include <iostream>
+#include <string>
+
+#include <websocketpp/http/parser.hpp>
+
+namespace websocketpp {
+namespace http {
+namespace parser {
+
+/// Stores, parses, and manipulates HTTP responses
+/**
+ * http::response provides the following functionality for working with HTTP
+ * responses.
+ *
+ * - Initialize response via manually setting each element
+ * - Initialize response via reading raw bytes and parsing
+ * - Once initialized, access individual parsed elements
+ * - Once initialized, read entire response as raw bytes
+ *
+ * http::response checks for header completeness separately from the full
+ * response. Once the header is complete, the Content-Length header is read to
+ * determine when to stop reading body bytes. If no Content-Length is present
+ * ready() will never return true. It is the responsibility of the caller to
+ * consume to determine when the response is complete (ie when the connection
+ * terminates, or some other metric).
+ */
+class response : public parser {
+public:
+    typedef response type;
+    typedef lib::shared_ptr<type> ptr;
+
+    response()
+      : m_read(0)
+      , m_buf(lib::make_shared<std::string>())
+      , m_status_code(status_code::uninitialized)
+      , m_state(RESPONSE_LINE) {}
+
+    /// Process bytes in the input buffer
+    /**
+     * Process up to len bytes from input buffer buf. Returns the number of
+     * bytes processed. Bytes left unprocessed means bytes left over after the
+     * final header delimiters.
+     *
+     * Consume is a streaming processor. It may be called multiple times on one
+     * response and the full headers need not be available before processing can
+     * begin. If the end of the response was reached during this call to consume
+     * the ready flag will be set. Further calls to consume once ready will be
+     * ignored.
+     *
+     * Consume will throw an http::exception in the case of an error. Typical
+     * error reasons include malformed responses, incomplete responses, and max
+     * header size being reached.
+     *
+     * @param buf Pointer to byte buffer
+     * @param len Size of byte buffer
+     * @return Number of bytes processed.
+     */
+    size_t consume(char const * buf, size_t len);
+
+    /// Process bytes in the input buffer (istream version)
+    /**
+     * Process bytes from istream s. Returns the number of bytes processed. 
+     * Bytes left unprocessed means bytes left over after the final header
+     * delimiters.
+     *
+     * Consume is a streaming processor. It may be called multiple times on one
+     * response and the full headers need not be available before processing can
+     * begin. If the end of the response was reached during this call to consume
+     * the ready flag will be set. Further calls to consume once ready will be
+     * ignored.
+     *
+     * Consume will throw an http::exception in the case of an error. Typical
+     * error reasons include malformed responses, incomplete responses, and max
+     * header size being reached.
+     *
+     * @param buf Pointer to byte buffer
+     * @param len Size of byte buffer
+     * @return Number of bytes processed.
+     */
+    size_t consume(std::istream & s);
+
+    /// Returns true if the response is ready.
+    /**
+     * @note will never return true if the content length header is not present
+     */
+    bool ready() const {
+        return m_state == DONE;
+    }
+
+    /// Returns true if the response headers are fully parsed.
+    bool headers_ready() const {
+        return (m_state == BODY || m_state == DONE);
+    }
+
+    /// Returns the full raw response
+    std::string raw() const;
+
+    /// Set response status code and message
+    /**
+     * Sets the response status code to `code` and looks up the corresponding
+     * message for standard codes. Non-standard codes will be entered as Unknown
+     * use set_status(status_code::value,std::string) overload to set both
+     * values explicitly.
+     *
+     * @param code Code to set
+     * @param msg Message to set
+     */
+    void set_status(status_code::value code);
+
+    /// Set response status code and message
+    /**
+     * Sets the response status code and message to independent custom values.
+     * use set_status(status_code::value) to set the code and have the standard
+     * message be automatically set.
+     *
+     * @param code Code to set
+     * @param msg Message to set
+     */
+    void set_status(status_code::value code, std::string const & msg);
+
+    /// Return the response status code
+    status_code::value get_status_code() const {
+        return m_status_code;
+    }
+
+    /// Return the response status message
+    const std::string& get_status_msg() const {
+        return m_status_msg;
+    }
+private:
+    /// Helper function for consume. Process response line
+    void process(std::string::iterator begin, std::string::iterator end);
+
+    /// Helper function for processing body bytes
+    size_t process_body(char const * buf, size_t len);
+
+    enum state {
+        RESPONSE_LINE = 0,
+        HEADERS = 1,
+        BODY = 2,
+        DONE = 3
+    };
+
+    std::string                     m_status_msg;
+    size_t                          m_read;
+    lib::shared_ptr<std::string>    m_buf;
+    status_code::value              m_status_code;
+    state                           m_state;
+
+};
+
+} // namespace parser
+} // namespace http
+} // namespace websocketpp
+
+#include <websocketpp/http/impl/response.hpp>
+
+#endif // HTTP_PARSER_RESPONSE_HPP
diff --git a/vendor/websocketpp/websocketpp/impl/connection_impl.hpp b/vendor/websocketpp/websocketpp/impl/connection_impl.hpp
new file mode 100644
index 0000000..d1f8dff
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/impl/connection_impl.hpp
@@ -0,0 +1,2372 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CONNECTION_IMPL_HPP
+#define WEBSOCKETPP_CONNECTION_IMPL_HPP
+
+#include <websocketpp/processors/hybi00.hpp>
+#include <websocketpp/processors/hybi07.hpp>
+#include <websocketpp/processors/hybi08.hpp>
+#include <websocketpp/processors/hybi13.hpp>
+
+#include <websocketpp/processors/processor.hpp>
+
+#include <websocketpp/common/platforms.hpp>
+#include <websocketpp/common/system_error.hpp>
+
+#include <algorithm>
+#include <exception>
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace websocketpp {
+
+namespace istate = session::internal_state;
+
+template <typename config>
+void connection<config>::set_termination_handler(
+    termination_handler new_handler)
+{
+    m_alog.write(log::alevel::devel,
+        "connection set_termination_handler");
+
+    //scoped_lock_type lock(m_connection_state_lock);
+
+    m_termination_handler = new_handler;
+}
+
+template <typename config>
+std::string const & connection<config>::get_origin() const {
+    //scoped_lock_type lock(m_connection_state_lock);
+    return m_processor->get_origin(m_request);
+}
+
+template <typename config>
+size_t connection<config>::get_buffered_amount() const {
+    //scoped_lock_type lock(m_connection_state_lock);
+    return m_send_buffer_size;
+}
+
+template <typename config>
+session::state::value connection<config>::get_state() const {
+    //scoped_lock_type lock(m_connection_state_lock);
+    return m_state;
+}
+
+template <typename config>
+lib::error_code connection<config>::send(std::string const & payload,
+    frame::opcode::value op)
+{
+    message_ptr msg = m_msg_manager->get_message(op,payload.size());
+    msg->append_payload(payload);
+    msg->set_compressed(true);
+
+    return send(msg);
+}
+
+template <typename config>
+lib::error_code connection<config>::send(void const * payload, size_t len,
+    frame::opcode::value op)
+{
+    message_ptr msg = m_msg_manager->get_message(op,len);
+    msg->append_payload(payload,len);
+
+    return send(msg);
+}
+
+template <typename config>
+lib::error_code connection<config>::send(typename config::message_type::ptr msg)
+{
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"connection send");
+    }
+
+    {
+        scoped_lock_type lock(m_connection_state_lock);
+        if (m_state != session::state::open) {
+           return error::make_error_code(error::invalid_state);
+        }
+    }
+
+    message_ptr outgoing_msg;
+    bool needs_writing = false;
+
+    if (msg->get_prepared()) {
+        outgoing_msg = msg;
+
+        scoped_lock_type lock(m_write_lock);
+        write_push(outgoing_msg);
+        needs_writing = !m_write_flag && !m_send_queue.empty();
+    } else {
+        outgoing_msg = m_msg_manager->get_message();
+
+        if (!outgoing_msg) {
+            return error::make_error_code(error::no_outgoing_buffers);
+        }
+
+        scoped_lock_type lock(m_write_lock);
+        lib::error_code ec = m_processor->prepare_data_frame(msg,outgoing_msg);
+
+        if (ec) {
+            return ec;
+        }
+
+        write_push(outgoing_msg);
+        needs_writing = !m_write_flag && !m_send_queue.empty();
+    }
+
+    if (needs_writing) {
+        transport_con_type::dispatch(lib::bind(
+            &type::write_frame,
+            type::get_shared()
+        ));
+    }
+
+    return lib::error_code();
+}
+
+template <typename config>
+void connection<config>::ping(std::string const& payload, lib::error_code& ec) {
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"connection ping");
+    }
+
+    {
+        scoped_lock_type lock(m_connection_state_lock);
+        if (m_state != session::state::open) {
+            std::stringstream ss;
+            ss << "connection::ping called from invalid state " << m_state;
+            m_alog.write(log::alevel::devel,ss.str());
+            ec = error::make_error_code(error::invalid_state);
+            return;
+        }
+    }
+
+    message_ptr msg = m_msg_manager->get_message();
+    if (!msg) {
+        ec = error::make_error_code(error::no_outgoing_buffers);
+        return;
+    }
+
+    ec = m_processor->prepare_ping(payload,msg);
+    if (ec) {return;}
+
+    // set ping timer if we are listening for one
+    if (m_pong_timeout_handler) {
+        // Cancel any existing timers
+        if (m_ping_timer) {
+            m_ping_timer->cancel();
+        }
+
+        if (m_pong_timeout_dur > 0) {
+            m_ping_timer = transport_con_type::set_timer(
+                m_pong_timeout_dur,
+                lib::bind(
+                    &type::handle_pong_timeout,
+                    type::get_shared(),
+                    payload,
+                    lib::placeholders::_1
+                )
+            );
+        }
+
+        if (!m_ping_timer) {
+            // Our transport doesn't support timers
+            m_elog.write(log::elevel::warn,"Warning: a pong_timeout_handler is \
+                set but the transport in use does not support timeouts.");
+        }
+    }
+
+    bool needs_writing = false;
+    {
+        scoped_lock_type lock(m_write_lock);
+        write_push(msg);
+        needs_writing = !m_write_flag && !m_send_queue.empty();
+    }
+
+    if (needs_writing) {
+        transport_con_type::dispatch(lib::bind(
+            &type::write_frame,
+            type::get_shared()
+        ));
+    }
+
+    ec = lib::error_code();
+}
+
+template<typename config>
+void connection<config>::ping(std::string const & payload) {
+    lib::error_code ec;
+    ping(payload,ec);
+    if (ec) {
+        throw exception(ec);
+    }
+}
+
+template<typename config>
+void connection<config>::handle_pong_timeout(std::string payload,
+    lib::error_code const & ec)
+{
+    if (ec) {
+        if (ec == transport::error::operation_aborted) {
+            // ignore, this is expected
+            return;
+        }
+
+        m_elog.write(log::elevel::devel,"pong_timeout error: "+ec.message());
+        return;
+    }
+
+    if (m_pong_timeout_handler) {
+        m_pong_timeout_handler(m_connection_hdl,payload);
+    }
+}
+
+template <typename config>
+void connection<config>::pong(std::string const& payload, lib::error_code& ec) {
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"connection pong");
+    }
+
+    {
+        scoped_lock_type lock(m_connection_state_lock);
+        if (m_state != session::state::open) {
+            std::stringstream ss;
+            ss << "connection::pong called from invalid state " << m_state;
+            m_alog.write(log::alevel::devel,ss.str());
+            ec = error::make_error_code(error::invalid_state);
+            return;
+        }
+    }
+
+    message_ptr msg = m_msg_manager->get_message();
+    if (!msg) {
+        ec = error::make_error_code(error::no_outgoing_buffers);
+        return;
+    }
+
+    ec = m_processor->prepare_pong(payload,msg);
+    if (ec) {return;}
+
+    bool needs_writing = false;
+    {
+        scoped_lock_type lock(m_write_lock);
+        write_push(msg);
+        needs_writing = !m_write_flag && !m_send_queue.empty();
+    }
+
+    if (needs_writing) {
+        transport_con_type::dispatch(lib::bind(
+            &type::write_frame,
+            type::get_shared()
+        ));
+    }
+
+    ec = lib::error_code();
+}
+
+template<typename config>
+void connection<config>::pong(std::string const & payload) {
+    lib::error_code ec;
+    pong(payload,ec);
+    if (ec) {
+        throw exception(ec);
+    }
+}
+
+template <typename config>
+void connection<config>::close(close::status::value const code,
+    std::string const & reason, lib::error_code & ec)
+{
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"connection close");
+    }
+
+    // Truncate reason to maximum size allowable in a close frame.
+    std::string tr(reason,0,std::min<size_t>(reason.size(),
+        frame::limits::close_reason_size));
+
+    scoped_lock_type lock(m_connection_state_lock);
+
+    if (m_state != session::state::open) {
+       ec = error::make_error_code(error::invalid_state);
+       return;
+    }
+
+    ec = this->send_close_frame(code,tr,false,close::status::terminal(code));
+}
+
+template<typename config>
+void connection<config>::close(close::status::value const code,
+    std::string const & reason)
+{
+    lib::error_code ec;
+    close(code,reason,ec);
+    if (ec) {
+        throw exception(ec);
+    }
+}
+
+/// Trigger the on_interrupt handler
+/**
+ * This is thread safe if the transport is thread safe
+ */
+template <typename config>
+lib::error_code connection<config>::interrupt() {
+    m_alog.write(log::alevel::devel,"connection connection::interrupt");
+    return transport_con_type::interrupt(
+        lib::bind(
+            &type::handle_interrupt,
+            type::get_shared()
+        )
+    );
+}
+
+
+template <typename config>
+void connection<config>::handle_interrupt() {
+    if (m_interrupt_handler) {
+        m_interrupt_handler(m_connection_hdl);
+    }
+}
+
+template <typename config>
+lib::error_code connection<config>::pause_reading() {
+    m_alog.write(log::alevel::devel,"connection connection::pause_reading");
+    return transport_con_type::dispatch(
+        lib::bind(
+            &type::handle_pause_reading,
+            type::get_shared()
+        )
+    );
+}
+
+/// Pause reading handler. Not safe to call directly
+template <typename config>
+void connection<config>::handle_pause_reading() {
+    m_alog.write(log::alevel::devel,"connection connection::handle_pause_reading");
+    m_read_flag = false;
+}
+
+template <typename config>
+lib::error_code connection<config>::resume_reading() {
+    m_alog.write(log::alevel::devel,"connection connection::resume_reading");
+    return transport_con_type::dispatch(
+        lib::bind(
+            &type::handle_resume_reading,
+            type::get_shared()
+        )
+    );
+}
+
+/// Resume reading helper method. Not safe to call directly
+template <typename config>
+void connection<config>::handle_resume_reading() {
+   m_read_flag = true;
+   read_frame();
+}
+
+
+
+
+
+
+
+
+
+
+
+template <typename config>
+bool connection<config>::get_secure() const {
+    //scoped_lock_type lock(m_connection_state_lock);
+    return m_uri->get_secure();
+}
+
+template <typename config>
+std::string const & connection<config>::get_host() const {
+    //scoped_lock_type lock(m_connection_state_lock);
+    return m_uri->get_host();
+}
+
+template <typename config>
+std::string const & connection<config>::get_resource() const {
+    //scoped_lock_type lock(m_connection_state_lock);
+    return m_uri->get_resource();
+}
+
+template <typename config>
+uint16_t connection<config>::get_port() const {
+    //scoped_lock_type lock(m_connection_state_lock);
+    return m_uri->get_port();
+}
+
+template <typename config>
+uri_ptr connection<config>::get_uri() const {
+    //scoped_lock_type lock(m_connection_state_lock);
+    return m_uri;
+}
+
+template <typename config>
+void connection<config>::set_uri(uri_ptr uri) {
+    //scoped_lock_type lock(m_connection_state_lock);
+    m_uri = uri;
+}
+
+
+
+
+
+
+template <typename config>
+std::string const & connection<config>::get_subprotocol() const {
+    return m_subprotocol;
+}
+
+template <typename config>
+std::vector<std::string> const &
+connection<config>::get_requested_subprotocols() const {
+    return m_requested_subprotocols;
+}
+
+template <typename config>
+void connection<config>::add_subprotocol(std::string const & value,
+    lib::error_code & ec)
+{
+    if (m_is_server) {
+        ec = error::make_error_code(error::client_only);
+        return;
+    }
+
+    // If the value is empty or has a non-RFC2616 token character it is invalid.
+    if (value.empty() || std::find_if(value.begin(),value.end(),
+                                      http::is_not_token_char) != value.end())
+    {
+        ec = error::make_error_code(error::invalid_subprotocol);
+        return;
+    }
+
+    m_requested_subprotocols.push_back(value);
+}
+
+template <typename config>
+void connection<config>::add_subprotocol(std::string const & value) {
+    lib::error_code ec;
+    this->add_subprotocol(value,ec);
+    if (ec) {
+        throw exception(ec);
+    }
+}
+
+
+template <typename config>
+void connection<config>::select_subprotocol(std::string const & value,
+    lib::error_code & ec)
+{
+    if (!m_is_server) {
+        ec = error::make_error_code(error::server_only);
+        return;
+    }
+
+    if (value.empty()) {
+        ec = lib::error_code();
+        return;
+    }
+
+    std::vector<std::string>::iterator it;
+
+    it = std::find(m_requested_subprotocols.begin(),
+                   m_requested_subprotocols.end(),
+                   value);
+
+    if (it == m_requested_subprotocols.end()) {
+        ec = error::make_error_code(error::unrequested_subprotocol);
+        return;
+    }
+
+    m_subprotocol = value;
+}
+
+template <typename config>
+void connection<config>::select_subprotocol(std::string const & value) {
+    lib::error_code ec;
+    this->select_subprotocol(value,ec);
+    if (ec) {
+        throw exception(ec);
+    }
+}
+
+
+template <typename config>
+std::string const &
+connection<config>::get_request_header(std::string const & key) const {
+    return m_request.get_header(key);
+}
+
+template <typename config>
+std::string const &
+connection<config>::get_request_body() const {
+    return m_request.get_body();
+}
+
+template <typename config>
+std::string const &
+connection<config>::get_response_header(std::string const & key) const {
+    return m_response.get_header(key);
+}
+
+// TODO: EXCEPTION_FREE
+template <typename config>
+void connection<config>::set_status(http::status_code::value code)
+{
+    if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
+        throw exception("Call to set_status from invalid state",
+                      error::make_error_code(error::invalid_state));
+    }
+    m_response.set_status(code);
+}
+
+// TODO: EXCEPTION_FREE
+template <typename config>
+void connection<config>::set_status(http::status_code::value code,
+    std::string const & msg)
+{
+    if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
+        throw exception("Call to set_status from invalid state",
+                      error::make_error_code(error::invalid_state));
+    }
+
+    m_response.set_status(code,msg);
+}
+
+// TODO: EXCEPTION_FREE
+template <typename config>
+void connection<config>::set_body(std::string const & value) {
+    if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
+        throw exception("Call to set_status from invalid state",
+                      error::make_error_code(error::invalid_state));
+    }
+
+    m_response.set_body(value);
+}
+
+// TODO: EXCEPTION_FREE
+template <typename config>
+void connection<config>::append_header(std::string const & key,
+    std::string const & val)
+{
+    if (m_is_server) {
+        if (m_internal_state == istate::PROCESS_HTTP_REQUEST) {
+            // we are setting response headers for an incoming server connection
+            m_response.append_header(key,val);
+        } else {
+            throw exception("Call to append_header from invalid state",
+                      error::make_error_code(error::invalid_state));
+        }
+    } else {
+        if (m_internal_state == istate::USER_INIT) {
+            // we are setting initial headers for an outgoing client connection
+            m_request.append_header(key,val);
+        } else {
+            throw exception("Call to append_header from invalid state",
+                      error::make_error_code(error::invalid_state));
+        }
+    }
+}
+
+// TODO: EXCEPTION_FREE
+template <typename config>
+void connection<config>::replace_header(std::string const & key,
+    std::string const & val)
+{
+    if (m_is_server) {
+        if (m_internal_state == istate::PROCESS_HTTP_REQUEST) {
+            // we are setting response headers for an incoming server connection
+            m_response.replace_header(key,val);
+        } else {
+            throw exception("Call to replace_header from invalid state",
+                        error::make_error_code(error::invalid_state));
+        }
+    } else {
+        if (m_internal_state == istate::USER_INIT) {
+            // we are setting initial headers for an outgoing client connection
+            m_request.replace_header(key,val);
+        } else {
+            throw exception("Call to replace_header from invalid state",
+                        error::make_error_code(error::invalid_state));
+        }
+    }
+}
+
+// TODO: EXCEPTION_FREE
+template <typename config>
+void connection<config>::remove_header(std::string const & key)
+{
+    if (m_is_server) {
+        if (m_internal_state == istate::PROCESS_HTTP_REQUEST) {
+            // we are setting response headers for an incoming server connection
+            m_response.remove_header(key);
+        } else {
+            throw exception("Call to remove_header from invalid state",
+                        error::make_error_code(error::invalid_state));
+        }
+    } else {
+        if (m_internal_state == istate::USER_INIT) {
+            // we are setting initial headers for an outgoing client connection
+            m_request.remove_header(key);
+        } else {
+            throw exception("Call to remove_header from invalid state",
+                        error::make_error_code(error::invalid_state));
+        }
+    }
+}
+
+/// Defer HTTP Response until later
+/**
+ * Used in the http handler to defer the HTTP response for this connection
+ * until later. Handshake timers will be canceled and the connection will be
+ * left open until `send_http_response` or an equivalent is called.
+ *
+ * Warning: deferred connections won't time out and as a result can tie up
+ * resources.
+ *
+ * @return A status code, zero on success, non-zero otherwise
+ */
+template <typename config>
+lib::error_code connection<config>::defer_http_response() {
+    // Cancel handshake timer, otherwise the connection will time out and we'll
+    // close the connection before the app has a chance to send a response.
+    if (m_handshake_timer) {
+        m_handshake_timer->cancel();
+        m_handshake_timer.reset();
+    }
+    
+    // Do something to signal deferral
+    m_http_state = session::http_state::deferred;
+    
+    return lib::error_code();
+}
+
+/// Send deferred HTTP Response (exception free)
+/**
+ * Sends an http response to an HTTP connection that was deferred. This will
+ * send a complete response including all headers, status line, and body
+ * text. The connection will be closed afterwards.
+ *
+ * @since 0.6.0
+ *
+ * @param ec A status code, zero on success, non-zero otherwise
+ */
+template <typename config>
+void connection<config>::send_http_response(lib::error_code & ec) {
+    {
+        scoped_lock_type lock(m_connection_state_lock);
+        if (m_http_state != session::http_state::deferred) {
+            ec = error::make_error_code(error::invalid_state);
+            return;
+        }
+    
+        m_http_state = session::http_state::body_written;
+    }
+    
+    this->write_http_response(lib::error_code());
+    ec = lib::error_code();
+}
+
+template <typename config>
+void connection<config>::send_http_response() {
+    lib::error_code ec;
+    this->send_http_response(ec);
+    if (ec) {
+        throw exception(ec);
+    }
+}
+
+
+
+
+/******** logic thread ********/
+
+template <typename config>
+void connection<config>::start() {
+    m_alog.write(log::alevel::devel,"connection start");
+
+    if (m_internal_state != istate::USER_INIT) {
+        m_alog.write(log::alevel::devel,"Start called in invalid state");
+        this->terminate(error::make_error_code(error::invalid_state));
+        return;
+    }
+
+    m_internal_state = istate::TRANSPORT_INIT;
+
+    // Depending on how the transport implements init this function may return
+    // immediately and call handle_transport_init later or call
+    // handle_transport_init from this function.
+    transport_con_type::init(
+        lib::bind(
+            &type::handle_transport_init,
+            type::get_shared(),
+            lib::placeholders::_1
+        )
+    );
+}
+
+template <typename config>
+void connection<config>::handle_transport_init(lib::error_code const & ec) {
+    m_alog.write(log::alevel::devel,"connection handle_transport_init");
+
+    lib::error_code ecm = ec;
+
+    if (m_internal_state != istate::TRANSPORT_INIT) {
+        m_alog.write(log::alevel::devel,
+          "handle_transport_init must be called from transport init state");
+        ecm = error::make_error_code(error::invalid_state);
+    }
+
+    if (ecm) {
+        std::stringstream s;
+        s << "handle_transport_init received error: "<< ecm.message();
+        m_elog.write(log::elevel::rerror,s.str());
+
+        this->terminate(ecm);
+        return;
+    }
+
+    // At this point the transport is ready to read and write bytes.
+    if (m_is_server) {
+        m_internal_state = istate::READ_HTTP_REQUEST;
+        this->read_handshake(1);
+    } else {
+        // We are a client. Set the processor to the version specified in the
+        // config file and send a handshake request.
+        m_internal_state = istate::WRITE_HTTP_REQUEST;
+        m_processor = get_processor(config::client_version);
+        this->send_http_request();
+    }
+}
+
+template <typename config>
+void connection<config>::read_handshake(size_t num_bytes) {
+    m_alog.write(log::alevel::devel,"connection read_handshake");
+
+    if (m_open_handshake_timeout_dur > 0) {
+        m_handshake_timer = transport_con_type::set_timer(
+            m_open_handshake_timeout_dur,
+            lib::bind(
+                &type::handle_open_handshake_timeout,
+                type::get_shared(),
+                lib::placeholders::_1
+            )
+        );
+    }
+
+    transport_con_type::async_read_at_least(
+        num_bytes,
+        m_buf,
+        config::connection_read_buffer_size,
+        lib::bind(
+            &type::handle_read_handshake,
+            type::get_shared(),
+            lib::placeholders::_1,
+            lib::placeholders::_2
+        )
+    );
+}
+
+// All exit paths for this function need to call write_http_response() or submit
+// a new read request with this function as the handler.
+template <typename config>
+void connection<config>::handle_read_handshake(lib::error_code const & ec,
+    size_t bytes_transferred)
+{
+    m_alog.write(log::alevel::devel,"connection handle_read_handshake");
+
+    lib::error_code ecm = ec;
+
+    if (!ecm) {
+        scoped_lock_type lock(m_connection_state_lock);
+        
+        if (m_state == session::state::connecting) {
+             if (m_internal_state != istate::READ_HTTP_REQUEST) {
+                ecm = error::make_error_code(error::invalid_state);
+             }
+        } else if (m_state == session::state::closed) {
+            // The connection was canceled while the response was being sent,
+            // usually by the handshake timer. This is basically expected
+            // (though hopefully rare) and there is nothing we can do so ignore.
+            m_alog.write(log::alevel::devel,
+                "handle_read_handshake invoked after connection was closed");
+            return;
+        } else {
+            ecm = error::make_error_code(error::invalid_state);
+        }
+    }
+
+    if (ecm) {
+        if (ecm == transport::error::eof && m_state == session::state::closed) {
+            // we expect to get eof if the connection is closed already
+            m_alog.write(log::alevel::devel,
+                    "got (expected) eof/state error from closed con");
+            return;
+        }
+        
+        log_err(log::elevel::rerror,"handle_read_handshake",ecm);
+        this->terminate(ecm);
+        return;
+    }
+
+    // Boundaries checking. TODO: How much of this should be done?
+    if (bytes_transferred > config::connection_read_buffer_size) {
+        m_elog.write(log::elevel::fatal,"Fatal boundaries checking error.");
+        this->terminate(make_error_code(error::general));
+        return;
+    }
+
+    size_t bytes_processed = 0;
+    try {
+        bytes_processed = m_request.consume(m_buf,bytes_transferred);
+    } catch (http::exception &e) {
+        // All HTTP exceptions will result in this request failing and an error
+        // response being returned. No more bytes will be read in this con.
+        m_response.set_status(e.m_error_code,e.m_error_msg);
+        this->write_http_response_error(error::make_error_code(error::http_parse_error));
+        return;
+    }
+
+    // More paranoid boundaries checking.
+    // TODO: Is this overkill?
+    if (bytes_processed > bytes_transferred) {
+        m_elog.write(log::elevel::fatal,"Fatal boundaries checking error.");
+        this->terminate(make_error_code(error::general));
+        return;
+    }
+
+    if (m_alog.static_test(log::alevel::devel)) {
+        std::stringstream s;
+        s << "bytes_transferred: " << bytes_transferred
+          << " bytes, bytes processed: " << bytes_processed << " bytes";
+        m_alog.write(log::alevel::devel,s.str());
+    }
+
+    if (m_request.ready()) {
+        lib::error_code processor_ec = this->initialize_processor();
+        if (processor_ec) {
+            this->write_http_response_error(processor_ec);
+            return;
+        }
+
+        if (m_processor && m_processor->get_version() == 0) {
+            // Version 00 has an extra requirement to read some bytes after the
+            // handshake
+            if (bytes_transferred-bytes_processed >= 8) {
+                m_request.replace_header(
+                    "Sec-WebSocket-Key3",
+                    std::string(m_buf+bytes_processed,m_buf+bytes_processed+8)
+                );
+                bytes_processed += 8;
+            } else {
+                // TODO: need more bytes
+                m_alog.write(log::alevel::devel,"short key3 read");
+                m_response.set_status(http::status_code::internal_server_error);
+                this->write_http_response_error(processor::error::make_error_code(processor::error::short_key3));
+                return;
+            }
+        }
+
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,m_request.raw());
+            if (!m_request.get_header("Sec-WebSocket-Key3").empty()) {
+                m_alog.write(log::alevel::devel,
+                    utility::to_hex(m_request.get_header("Sec-WebSocket-Key3")));
+            }
+        }
+
+        // The remaining bytes in m_buf are frame data. Copy them to the
+        // beginning of the buffer and note the length. They will be read after
+        // the handshake completes and before more bytes are read.
+        std::copy(m_buf+bytes_processed,m_buf+bytes_transferred,m_buf);
+        m_buf_cursor = bytes_transferred-bytes_processed;
+
+
+        m_internal_state = istate::PROCESS_HTTP_REQUEST;
+        
+        // We have the complete request. Process it.
+        lib::error_code handshake_ec = this->process_handshake_request();
+        
+        // Write a response if this is a websocket connection or if it is an
+        // HTTP connection for which the response has not been deferred or
+        // started yet by a different system (i.e. still in init state).
+        if (!m_is_http || m_http_state == session::http_state::init) {
+            this->write_http_response(handshake_ec);
+        }
+    } else {
+        // read at least 1 more byte
+        transport_con_type::async_read_at_least(
+            1,
+            m_buf,
+            config::connection_read_buffer_size,
+            lib::bind(
+                &type::handle_read_handshake,
+                type::get_shared(),
+                lib::placeholders::_1,
+                lib::placeholders::_2
+            )
+        );
+    }
+}
+
+// write_http_response requires the request to be fully read and the connection
+// to be in the PROCESS_HTTP_REQUEST state. In some cases we can detect errors
+// before the request is fully read (specifically at a point where we aren't
+// sure if the hybi00 key3 bytes need to be read). This method sets the correct
+// state and calls write_http_response
+template <typename config>
+void connection<config>::write_http_response_error(lib::error_code const & ec) {
+    if (m_internal_state != istate::READ_HTTP_REQUEST) {
+        m_alog.write(log::alevel::devel,
+            "write_http_response_error called in invalid state");
+        this->terminate(error::make_error_code(error::invalid_state));
+        return;
+    }
+    
+    m_internal_state = istate::PROCESS_HTTP_REQUEST;
+    
+    this->write_http_response(ec);
+}
+
+// All exit paths for this function need to call write_http_response() or submit
+// a new read request with this function as the handler.
+template <typename config>
+void connection<config>::handle_read_frame(lib::error_code const & ec,
+    size_t bytes_transferred)
+{
+    //m_alog.write(log::alevel::devel,"connection handle_read_frame");
+
+    lib::error_code ecm = ec;
+
+    if (!ecm && m_internal_state != istate::PROCESS_CONNECTION) {
+        ecm = error::make_error_code(error::invalid_state);
+    }
+
+    if (ecm) {
+        log::level echannel = log::elevel::rerror;
+        
+        if (ecm == transport::error::eof) {
+            if (m_state == session::state::closed) {
+                // we expect to get eof if the connection is closed already
+                // just ignore it
+                m_alog.write(log::alevel::devel,"got eof from closed con");
+                return;
+            } else if (m_state == session::state::closing && !m_is_server) {
+                // If we are a client we expect to get eof in the closing state,
+                // this is a signal to terminate our end of the connection after
+                // the closing handshake
+                terminate(lib::error_code());
+                return;
+            }
+        } else if (ecm == error::invalid_state) {
+            // In general, invalid state errors in the closed state are the
+            // result of handlers that were in the system already when the state
+            // changed and should be ignored as they pose no problems and there
+            // is nothing useful that we can do about them.
+            if (m_state == session::state::closed) {
+                m_alog.write(log::alevel::devel,
+                    "handle_read_frame: got invalid istate in closed state");
+                return;
+            }
+        } else if (ecm == transport::error::tls_short_read) {
+            if (m_state == session::state::closed) {
+                // We expect to get a TLS short read if we try to read after the
+                // connection is closed. If this happens ignore and exit the
+                // read frame path.
+                terminate(lib::error_code());
+                return;
+            }
+            echannel = log::elevel::rerror;
+        } else if (ecm == transport::error::action_after_shutdown) {
+            echannel = log::elevel::info;
+        }
+        
+        log_err(echannel, "handle_read_frame", ecm);
+        this->terminate(ecm);
+        return;
+    }
+
+    // Boundaries checking. TODO: How much of this should be done?
+    /*if (bytes_transferred > config::connection_read_buffer_size) {
+        m_elog.write(log::elevel::fatal,"Fatal boundaries checking error");
+        this->terminate(make_error_code(error::general));
+        return;
+    }*/
+
+    size_t p = 0;
+
+    if (m_alog.static_test(log::alevel::devel)) {
+        std::stringstream s;
+        s << "p = " << p << " bytes transferred = " << bytes_transferred;
+        m_alog.write(log::alevel::devel,s.str());
+    }
+
+    while (p < bytes_transferred) {
+        if (m_alog.static_test(log::alevel::devel)) {
+            std::stringstream s;
+            s << "calling consume with " << bytes_transferred-p << " bytes";
+            m_alog.write(log::alevel::devel,s.str());
+        }
+
+        lib::error_code consume_ec;
+
+        if (m_alog.static_test(log::alevel::devel)) {
+            std::stringstream s;
+            s << "Processing Bytes: " << utility::to_hex(reinterpret_cast<uint8_t*>(m_buf)+p,bytes_transferred-p);
+            m_alog.write(log::alevel::devel,s.str());
+        }
+
+        p += m_processor->consume(
+            reinterpret_cast<uint8_t*>(m_buf)+p,
+            bytes_transferred-p,
+            consume_ec
+        );
+
+        if (m_alog.static_test(log::alevel::devel)) {
+            std::stringstream s;
+            s << "bytes left after consume: " << bytes_transferred-p;
+            m_alog.write(log::alevel::devel,s.str());
+        }
+        if (consume_ec) {
+            log_err(log::elevel::rerror, "consume", consume_ec);
+
+            if (config::drop_on_protocol_error) {
+                this->terminate(consume_ec);
+                return;
+            } else {
+                lib::error_code close_ec;
+                this->close(
+                    processor::error::to_ws(consume_ec),
+                    consume_ec.message(),
+                    close_ec
+                );
+
+                if (close_ec) {
+                    log_err(log::elevel::fatal, "Protocol error close frame ", close_ec);
+                    this->terminate(close_ec);
+                    return;
+                }
+            }
+            return;
+        }
+
+        if (m_processor->ready()) {
+            if (m_alog.static_test(log::alevel::devel)) {
+                std::stringstream s;
+                s << "Complete message received. Dispatching";
+                m_alog.write(log::alevel::devel,s.str());
+            }
+
+            message_ptr msg = m_processor->get_message();
+
+            if (!msg) {
+                m_alog.write(log::alevel::devel, "null message from m_processor");
+            } else if (!is_control(msg->get_opcode())) {
+                // data message, dispatch to user
+                if (m_state != session::state::open) {
+                    m_elog.write(log::elevel::warn, "got non-close frame while closing");
+                } else if (m_message_handler) {
+                    m_message_handler(m_connection_hdl, msg);
+                }
+            } else {
+                process_control_frame(msg);
+            }
+        }
+    }
+
+    read_frame();
+}
+
+/// Issue a new transport read unless reading is paused.
+template <typename config>
+void connection<config>::read_frame() {
+    if (!m_read_flag) {
+        return;
+    }
+    
+    transport_con_type::async_read_at_least(
+        // std::min wont work with undefined static const values.
+        // TODO: is there a more elegant way to do this?
+        // Need to determine if requesting 1 byte or the exact number of bytes
+        // is better here. 1 byte lets us be a bit more responsive at a
+        // potential expense of additional runs through handle_read_frame
+        /*(m_processor->get_bytes_needed() > config::connection_read_buffer_size ?
+         config::connection_read_buffer_size : m_processor->get_bytes_needed())*/
+        1,
+        m_buf,
+        config::connection_read_buffer_size,
+        m_handle_read_frame
+    );
+}
+
+template <typename config>
+lib::error_code connection<config>::initialize_processor() {
+    m_alog.write(log::alevel::devel,"initialize_processor");
+
+    // if it isn't a websocket handshake nothing to do.
+    if (!processor::is_websocket_handshake(m_request)) {
+        return lib::error_code();
+    }
+
+    int version = processor::get_websocket_version(m_request);
+
+    if (version < 0) {
+        m_alog.write(log::alevel::devel, "BAD REQUEST: can't determine version");
+        m_response.set_status(http::status_code::bad_request);
+        return error::make_error_code(error::invalid_version);
+    }
+
+    m_processor = get_processor(version);
+
+    // if the processor is not null we are done
+    if (m_processor) {
+        return lib::error_code();
+    }
+
+    // We don't have a processor for this version. Return bad request
+    // with Sec-WebSocket-Version header filled with values we do accept
+    m_alog.write(log::alevel::devel, "BAD REQUEST: no processor for version");
+    m_response.set_status(http::status_code::bad_request);
+
+    std::stringstream ss;
+    std::string sep;
+    std::vector<int>::const_iterator it;
+    for (it = versions_supported.begin(); it != versions_supported.end(); it++)
+    {
+        ss << sep << *it;
+        sep = ",";
+    }
+
+    m_response.replace_header("Sec-WebSocket-Version",ss.str());
+    return error::make_error_code(error::unsupported_version);
+}
+
+template <typename config>
+lib::error_code connection<config>::process_handshake_request() {
+    m_alog.write(log::alevel::devel,"process handshake request");
+
+    if (!processor::is_websocket_handshake(m_request)) {
+        // this is not a websocket handshake. Process as plain HTTP
+        m_alog.write(log::alevel::devel,"HTTP REQUEST");
+
+        // extract URI from request
+        m_uri = processor::get_uri_from_host(
+            m_request,
+            (transport_con_type::is_secure() ? "https" : "http")
+        );
+
+        if (!m_uri->get_valid()) {
+            m_alog.write(log::alevel::devel, "Bad request: failed to parse uri");
+            m_response.set_status(http::status_code::bad_request);
+            return error::make_error_code(error::invalid_uri);
+        }
+
+        if (m_http_handler) {
+            m_is_http = true;
+            m_http_handler(m_connection_hdl);
+            
+            if (m_state == session::state::closed) {
+                return error::make_error_code(error::http_connection_ended);
+            }
+        } else {
+            set_status(http::status_code::upgrade_required);
+            return error::make_error_code(error::upgrade_required);
+        }
+
+        return lib::error_code();
+    }
+
+    lib::error_code ec = m_processor->validate_handshake(m_request);
+
+    // Validate: make sure all required elements are present.
+    if (ec){
+        // Not a valid handshake request
+        m_alog.write(log::alevel::devel, "Bad request " + ec.message());
+        m_response.set_status(http::status_code::bad_request);
+        return ec;
+    }
+
+    // Read extension parameters and set up values necessary for the end user
+    // to complete extension negotiation.
+    std::pair<lib::error_code,std::string> neg_results;
+    neg_results = m_processor->negotiate_extensions(m_request);
+
+    if (neg_results.first) {
+        // There was a fatal error in extension parsing that should result in
+        // a failed connection attempt.
+        m_alog.write(log::alevel::devel, "Bad request: " + neg_results.first.message());
+        m_response.set_status(http::status_code::bad_request);
+        return neg_results.first;
+    } else {
+        // extension negotiation succeeded, set response header accordingly
+        // we don't send an empty extensions header because it breaks many
+        // clients.
+        if (neg_results.second.size() > 0) {
+            m_response.replace_header("Sec-WebSocket-Extensions",
+                neg_results.second);
+        }
+    }
+
+    // extract URI from request
+    m_uri = m_processor->get_uri(m_request);
+
+
+    if (!m_uri->get_valid()) {
+        m_alog.write(log::alevel::devel, "Bad request: failed to parse uri");
+        m_response.set_status(http::status_code::bad_request);
+        return error::make_error_code(error::invalid_uri);
+    }
+
+    // extract subprotocols
+    lib::error_code subp_ec = m_processor->extract_subprotocols(m_request,
+        m_requested_subprotocols);
+
+    if (subp_ec) {
+        // should we do anything?
+    }
+
+    // Ask application to validate the connection
+    if (!m_validate_handler || m_validate_handler(m_connection_hdl)) {
+        m_response.set_status(http::status_code::switching_protocols);
+
+        // Write the appropriate response headers based on request and
+        // processor version
+        ec = m_processor->process_handshake(m_request,m_subprotocol,m_response);
+
+        if (ec) {
+            std::stringstream s;
+            s << "Processing error: " << ec << "(" << ec.message() << ")";
+            m_alog.write(log::alevel::devel, s.str());
+
+            m_response.set_status(http::status_code::internal_server_error);
+            return ec;
+        }
+    } else {
+        // User application has rejected the handshake
+        m_alog.write(log::alevel::devel, "USER REJECT");
+
+        // Use Bad Request if the user handler did not provide a more
+        // specific http response error code.
+        // TODO: is there a better default?
+        if (m_response.get_status_code() == http::status_code::uninitialized) {
+            m_response.set_status(http::status_code::bad_request);
+        }
+        
+        return error::make_error_code(error::rejected);
+    }
+
+    return lib::error_code();
+}
+
+template <typename config>
+void connection<config>::write_http_response(lib::error_code const & ec) {
+    m_alog.write(log::alevel::devel,"connection write_http_response");
+
+    if (ec == error::make_error_code(error::http_connection_ended)) {
+        m_alog.write(log::alevel::http,"An HTTP handler took over the connection.");
+        return;
+    }
+
+    if (m_response.get_status_code() == http::status_code::uninitialized) {
+        m_response.set_status(http::status_code::internal_server_error);
+        m_ec = error::make_error_code(error::general);
+    } else {
+        m_ec = ec;
+    }
+
+    m_response.set_version("HTTP/1.1");
+
+    // Set server header based on the user agent settings
+    if (m_response.get_header("Server").empty()) {
+        if (!m_user_agent.empty()) {
+            m_response.replace_header("Server",m_user_agent);
+        } else {
+            m_response.remove_header("Server");
+        }
+    }
+
+    // have the processor generate the raw bytes for the wire (if it exists)
+    if (m_processor) {
+        m_handshake_buffer = m_processor->get_raw(m_response);
+    } else {
+        // a processor wont exist for raw HTTP responses.
+        m_handshake_buffer = m_response.raw();
+    }
+
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"Raw Handshake response:\n"+m_handshake_buffer);
+        if (!m_response.get_header("Sec-WebSocket-Key3").empty()) {
+            m_alog.write(log::alevel::devel,
+                utility::to_hex(m_response.get_header("Sec-WebSocket-Key3")));
+        }
+    }
+
+    // write raw bytes
+    transport_con_type::async_write(
+        m_handshake_buffer.data(),
+        m_handshake_buffer.size(),
+        lib::bind(
+            &type::handle_write_http_response,
+            type::get_shared(),
+            lib::placeholders::_1
+        )
+    );
+}
+
+template <typename config>
+void connection<config>::handle_write_http_response(lib::error_code const & ec) {
+    m_alog.write(log::alevel::devel,"handle_write_http_response");
+
+    lib::error_code ecm = ec;
+
+    if (!ecm) {
+        scoped_lock_type lock(m_connection_state_lock);
+        
+        if (m_state == session::state::connecting) {
+             if (m_internal_state != istate::PROCESS_HTTP_REQUEST) {
+                ecm = error::make_error_code(error::invalid_state);
+             }
+        } else if (m_state == session::state::closed) {
+            // The connection was canceled while the response was being sent,
+            // usually by the handshake timer. This is basically expected
+            // (though hopefully rare) and there is nothing we can do so ignore.
+            m_alog.write(log::alevel::devel,
+                "handle_write_http_response invoked after connection was closed");
+            return;
+        } else {
+            ecm = error::make_error_code(error::invalid_state);
+        }
+    }
+
+    if (ecm) {
+        if (ecm == transport::error::eof && m_state == session::state::closed) {
+            // we expect to get eof if the connection is closed already
+            m_alog.write(log::alevel::devel,
+                    "got (expected) eof/state error from closed con");
+            return;
+        }
+        
+        log_err(log::elevel::rerror,"handle_write_http_response",ecm);
+        this->terminate(ecm);
+        return;
+    }
+
+    if (m_handshake_timer) {
+        m_handshake_timer->cancel();
+        m_handshake_timer.reset();
+    }
+
+    if (m_response.get_status_code() != http::status_code::switching_protocols)
+    {
+        /*if (m_processor || m_ec == error::http_parse_error || 
+            m_ec == error::invalid_version || m_ec == error::unsupported_version
+            || m_ec == error::upgrade_required)
+        {*/
+        if (!m_is_http) {
+            std::stringstream s;
+            s << "Handshake ended with HTTP error: "
+              << m_response.get_status_code();
+            m_elog.write(log::elevel::rerror,s.str());
+        } else {
+            // if this was not a websocket connection, we have written
+            // the expected response and the connection can be closed.
+            
+            this->log_http_result();
+            
+            if (m_ec) {
+                m_alog.write(log::alevel::devel,
+                    "got to writing HTTP results with m_ec set: "+m_ec.message());
+            }
+            m_ec = make_error_code(error::http_connection_ended);
+        }        
+        
+        this->terminate(m_ec);
+        return;
+    }
+
+    this->log_open_result();
+
+    m_internal_state = istate::PROCESS_CONNECTION;
+    m_state = session::state::open;
+
+    if (m_open_handler) {
+        m_open_handler(m_connection_hdl);
+    }
+
+    this->handle_read_frame(lib::error_code(), m_buf_cursor);
+}
+
+template <typename config>
+void connection<config>::send_http_request() {
+    m_alog.write(log::alevel::devel,"connection send_http_request");
+
+    // TODO: origin header?
+
+    // Have the protocol processor fill in the appropriate fields based on the
+    // selected client version
+    if (m_processor) {
+        lib::error_code ec;
+        ec = m_processor->client_handshake_request(m_request,m_uri,
+            m_requested_subprotocols);
+
+        if (ec) {
+            log_err(log::elevel::fatal,"Internal library error: Processor",ec);
+            return;
+        }
+    } else {
+        m_elog.write(log::elevel::fatal,"Internal library error: missing processor");
+        return;
+    }
+
+    // Unless the user has overridden the user agent, send generic WS++ UA.
+    if (m_request.get_header("User-Agent").empty()) {
+        if (!m_user_agent.empty()) {
+            m_request.replace_header("User-Agent",m_user_agent);
+        } else {
+            m_request.remove_header("User-Agent");
+        }
+    }
+
+    m_handshake_buffer = m_request.raw();
+
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"Raw Handshake request:\n"+m_handshake_buffer);
+    }
+
+    if (m_open_handshake_timeout_dur > 0) {
+        m_handshake_timer = transport_con_type::set_timer(
+            m_open_handshake_timeout_dur,
+            lib::bind(
+                &type::handle_open_handshake_timeout,
+                type::get_shared(),
+                lib::placeholders::_1
+            )
+        );
+    }
+
+    transport_con_type::async_write(
+        m_handshake_buffer.data(),
+        m_handshake_buffer.size(),
+        lib::bind(
+            &type::handle_send_http_request,
+            type::get_shared(),
+            lib::placeholders::_1
+        )
+    );
+}
+
+template <typename config>
+void connection<config>::handle_send_http_request(lib::error_code const & ec) {
+    m_alog.write(log::alevel::devel,"handle_send_http_request");
+
+    lib::error_code ecm = ec;
+
+    if (!ecm) {
+        scoped_lock_type lock(m_connection_state_lock);
+        
+        if (m_state == session::state::connecting) {
+             if (m_internal_state != istate::WRITE_HTTP_REQUEST) {
+                ecm = error::make_error_code(error::invalid_state);
+             } else {
+                m_internal_state = istate::READ_HTTP_RESPONSE;
+             }
+        } else if (m_state == session::state::closed) {
+            // The connection was canceled while the response was being sent,
+            // usually by the handshake timer. This is basically expected
+            // (though hopefully rare) and there is nothing we can do so ignore.
+            m_alog.write(log::alevel::devel,
+                "handle_send_http_request invoked after connection was closed");
+            return;
+        } else {
+            ecm = error::make_error_code(error::invalid_state);
+        }
+    }
+
+    if (ecm) {
+        if (ecm == transport::error::eof && m_state == session::state::closed) {
+            // we expect to get eof if the connection is closed already
+            m_alog.write(log::alevel::devel,
+                    "got (expected) eof/state error from closed con");
+            return;
+        }
+        
+        log_err(log::elevel::rerror,"handle_send_http_request",ecm);
+        this->terminate(ecm);
+        return;
+    }
+
+    transport_con_type::async_read_at_least(
+        1,
+        m_buf,
+        config::connection_read_buffer_size,
+        lib::bind(
+            &type::handle_read_http_response,
+            type::get_shared(),
+            lib::placeholders::_1,
+            lib::placeholders::_2
+        )
+    );
+}
+
+template <typename config>
+void connection<config>::handle_read_http_response(lib::error_code const & ec,
+    size_t bytes_transferred)
+{
+    m_alog.write(log::alevel::devel,"handle_read_http_response");
+
+    lib::error_code ecm = ec;
+
+    if (!ecm) {
+        scoped_lock_type lock(m_connection_state_lock);
+        
+        if (m_state == session::state::connecting) {
+            if (m_internal_state != istate::READ_HTTP_RESPONSE) {
+                ecm = error::make_error_code(error::invalid_state);
+            }
+        } else if (m_state == session::state::closed) {
+            // The connection was canceled while the response was being sent,
+            // usually by the handshake timer. This is basically expected
+            // (though hopefully rare) and there is nothing we can do so ignore.
+            m_alog.write(log::alevel::devel,
+                "handle_read_http_response invoked after connection was closed");
+            return;
+        } else {
+            ecm = error::make_error_code(error::invalid_state);
+        }
+    }
+
+    if (ecm) {
+        if (ecm == transport::error::eof && m_state == session::state::closed) {
+            // we expect to get eof if the connection is closed already
+            m_alog.write(log::alevel::devel,
+                    "got (expected) eof/state error from closed con");
+            return;
+        }
+        
+        log_err(log::elevel::rerror,"handle_read_http_response",ecm);
+        this->terminate(ecm);
+        return;
+    }
+    
+    size_t bytes_processed = 0;
+    // TODO: refactor this to use error codes rather than exceptions
+    try {
+        bytes_processed = m_response.consume(m_buf,bytes_transferred);
+    } catch (http::exception & e) {
+        m_elog.write(log::elevel::rerror,
+            std::string("error in handle_read_http_response: ")+e.what());
+        this->terminate(make_error_code(error::general));
+        return;
+    }
+
+    m_alog.write(log::alevel::devel,std::string("Raw response: ")+m_response.raw());
+
+    if (m_response.headers_ready()) {
+        if (m_handshake_timer) {
+            m_handshake_timer->cancel();
+            m_handshake_timer.reset();
+        }
+
+        lib::error_code validate_ec = m_processor->validate_server_handshake_response(
+            m_request,
+            m_response
+        );
+        if (validate_ec) {
+            log_err(log::elevel::rerror,"Server handshake response",validate_ec);
+            this->terminate(validate_ec);
+            return;
+        }
+
+        // Read extension parameters and set up values necessary for the end
+        // user to complete extension negotiation.
+        std::pair<lib::error_code,std::string> neg_results;
+        neg_results = m_processor->negotiate_extensions(m_response);
+
+        if (neg_results.first) {
+            // There was a fatal error in extension negotiation. For the moment
+            // kill all connections that fail extension negotiation.
+            
+            // TODO: deal with cases where the response is well formed but 
+            // doesn't match the options requested by the client. Its possible
+            // that the best behavior in this cases is to log and continue with
+            // an unextended connection.
+            m_alog.write(log::alevel::devel, "Extension negotiation failed: " 
+                + neg_results.first.message());
+            this->terminate(make_error_code(error::extension_neg_failed));
+            // TODO: close connection with reason 1010 (and list extensions)
+        }
+
+        // response is valid, connection can now be assumed to be open      
+        m_internal_state = istate::PROCESS_CONNECTION;
+        m_state = session::state::open;
+
+        this->log_open_result();
+
+        if (m_open_handler) {
+            m_open_handler(m_connection_hdl);
+        }
+
+        // The remaining bytes in m_buf are frame data. Copy them to the
+        // beginning of the buffer and note the length. They will be read after
+        // the handshake completes and before more bytes are read.
+        std::copy(m_buf+bytes_processed,m_buf+bytes_transferred,m_buf);
+        m_buf_cursor = bytes_transferred-bytes_processed;
+
+        this->handle_read_frame(lib::error_code(), m_buf_cursor);
+    } else {
+        transport_con_type::async_read_at_least(
+            1,
+            m_buf,
+            config::connection_read_buffer_size,
+            lib::bind(
+                &type::handle_read_http_response,
+                type::get_shared(),
+                lib::placeholders::_1,
+                lib::placeholders::_2
+            )
+        );
+    }
+}
+
+template <typename config>
+void connection<config>::handle_open_handshake_timeout(
+    lib::error_code const & ec)
+{
+    if (ec == transport::error::operation_aborted) {
+        m_alog.write(log::alevel::devel,"open handshake timer cancelled");
+    } else if (ec) {
+        m_alog.write(log::alevel::devel,
+            "open handle_open_handshake_timeout error: "+ec.message());
+        // TODO: ignore or fail here?
+    } else {
+        m_alog.write(log::alevel::devel,"open handshake timer expired");
+        terminate(make_error_code(error::open_handshake_timeout));
+    }
+}
+
+template <typename config>
+void connection<config>::handle_close_handshake_timeout(
+    lib::error_code const & ec)
+{
+    if (ec == transport::error::operation_aborted) {
+        m_alog.write(log::alevel::devel,"asio close handshake timer cancelled");
+    } else if (ec) {
+        m_alog.write(log::alevel::devel,
+            "asio open handle_close_handshake_timeout error: "+ec.message());
+        // TODO: ignore or fail here?
+    } else {
+        m_alog.write(log::alevel::devel, "asio close handshake timer expired");
+        terminate(make_error_code(error::close_handshake_timeout));
+    }
+}
+
+template <typename config>
+void connection<config>::terminate(lib::error_code const & ec) {
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"connection terminate");
+    }
+
+    // Cancel close handshake timer
+    if (m_handshake_timer) {
+        m_handshake_timer->cancel();
+        m_handshake_timer.reset();
+    }
+
+    terminate_status tstat = unknown;
+    if (ec) {
+        m_ec = ec;
+        m_local_close_code = close::status::abnormal_close;
+        m_local_close_reason = ec.message();
+    }
+
+    // TODO: does any of this need a mutex?
+    if (m_is_http) {
+        m_http_state = session::http_state::closed;
+    }
+    if (m_state == session::state::connecting) {
+        m_state = session::state::closed;
+        tstat = failed;
+        
+        // Log fail result here before socket is shut down and we can't get
+        // the remote address, etc anymore
+        if (m_ec != error::http_connection_ended) {
+            log_fail_result();
+        }
+    } else if (m_state != session::state::closed) {
+        m_state = session::state::closed;
+        tstat = closed;
+    } else {
+        m_alog.write(log::alevel::devel,
+            "terminate called on connection that was already terminated");
+        return;
+    }
+
+    // TODO: choose between shutdown and close based on error code sent
+
+    transport_con_type::async_shutdown(
+        lib::bind(
+            &type::handle_terminate,
+            type::get_shared(),
+            tstat,
+            lib::placeholders::_1
+        )
+    );
+}
+
+template <typename config>
+void connection<config>::handle_terminate(terminate_status tstat,
+    lib::error_code const & ec)
+{
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"connection handle_terminate");
+    }
+
+    if (ec) {
+        // there was an error actually shutting down the connection
+        log_err(log::elevel::devel,"handle_terminate",ec);
+    }
+
+    // clean shutdown
+    if (tstat == failed) {
+        if (m_ec != error::http_connection_ended) {
+            if (m_fail_handler) {
+                m_fail_handler(m_connection_hdl);
+            }
+        }
+    } else if (tstat == closed) {
+        if (m_close_handler) {
+            m_close_handler(m_connection_hdl);
+        }
+        log_close_result();
+    } else {
+        m_elog.write(log::elevel::rerror,"Unknown terminate_status");
+    }
+
+    // call the termination handler if it exists
+    // if it exists it might (but shouldn't) refer to a bad memory location.
+    // If it does, we don't care and should catch and ignore it.
+    if (m_termination_handler) {
+        try {
+            m_termination_handler(type::get_shared());
+        } catch (std::exception const & e) {
+            m_elog.write(log::elevel::warn,
+                std::string("termination_handler call failed. Reason was: ")+e.what());
+        }
+    }
+}
+
+template <typename config>
+void connection<config>::write_frame() {
+    //m_alog.write(log::alevel::devel,"connection write_frame");
+
+    {
+        scoped_lock_type lock(m_write_lock);
+
+        // Check the write flag. If true, there is an outstanding transport
+        // write already. In this case we just return. The write handler will
+        // start a new write if the write queue isn't empty. If false, we set
+        // the write flag and proceed to initiate a transport write.
+        if (m_write_flag) {
+            return;
+        }
+
+        // pull off all the messages that are ready to write.
+        // stop if we get a message marked terminal
+        message_ptr next_message = write_pop();
+        while (next_message) {
+            m_current_msgs.push_back(next_message);
+            if (!next_message->get_terminal()) {
+                next_message = write_pop();
+            } else {
+                next_message = message_ptr();
+            }
+        }
+        
+        if (m_current_msgs.empty()) {
+            // there was nothing to send
+            return;
+        } else {
+            // At this point we own the next messages to be sent and are
+            // responsible for holding the write flag until they are 
+            // successfully sent or there is some error
+            m_write_flag = true;
+        }
+    }
+
+    typename std::vector<message_ptr>::iterator it;
+    for (it = m_current_msgs.begin(); it != m_current_msgs.end(); ++it) {
+        std::string const & header = (*it)->get_header();
+        std::string const & payload = (*it)->get_payload();
+
+        m_send_buffer.push_back(transport::buffer(header.c_str(),header.size()));
+        m_send_buffer.push_back(transport::buffer(payload.c_str(),payload.size()));   
+    }
+
+    // Print detailed send stats if those log levels are enabled
+    if (m_alog.static_test(log::alevel::frame_header)) {
+    if (m_alog.dynamic_test(log::alevel::frame_header)) {
+        std::stringstream general,header,payload;
+        
+        general << "Dispatching write containing " << m_current_msgs.size()
+                <<" message(s) containing ";
+        header << "Header Bytes: \n";
+        payload << "Payload Bytes: \n";
+        
+        size_t hbytes = 0;
+        size_t pbytes = 0;
+        
+        for (size_t i = 0; i < m_current_msgs.size(); i++) {
+            hbytes += m_current_msgs[i]->get_header().size();
+            pbytes += m_current_msgs[i]->get_payload().size();
+
+            
+            header << "[" << i << "] (" 
+                   << m_current_msgs[i]->get_header().size() << ") " 
+                   << utility::to_hex(m_current_msgs[i]->get_header()) << "\n";
+
+            if (m_alog.static_test(log::alevel::frame_payload)) {
+            if (m_alog.dynamic_test(log::alevel::frame_payload)) {
+                payload << "[" << i << "] (" 
+                        << m_current_msgs[i]->get_payload().size() << ") ["<<m_current_msgs[i]->get_opcode()<<"] "
+                        << (m_current_msgs[i]->get_opcode() == frame::opcode::text ? 
+                                m_current_msgs[i]->get_payload() : 
+                                utility::to_hex(m_current_msgs[i]->get_payload())
+                           ) 
+                        << "\n";
+            }
+            }  
+        }
+        
+        general << hbytes << " header bytes and " << pbytes << " payload bytes";
+        
+        m_alog.write(log::alevel::frame_header,general.str());
+        m_alog.write(log::alevel::frame_header,header.str());
+        m_alog.write(log::alevel::frame_payload,payload.str());
+    }
+    }
+
+    transport_con_type::async_write(
+        m_send_buffer,
+        m_write_frame_handler
+    );
+}
+
+template <typename config>
+void connection<config>::handle_write_frame(lib::error_code const & ec)
+{
+    if (m_alog.static_test(log::alevel::devel)) {
+        m_alog.write(log::alevel::devel,"connection handle_write_frame");
+    }
+
+    bool terminal = m_current_msgs.back()->get_terminal();
+
+    m_send_buffer.clear();
+    m_current_msgs.clear();
+    // TODO: recycle instead of deleting
+
+    if (ec) {
+        log_err(log::elevel::fatal,"handle_write_frame",ec);
+        this->terminate(ec);
+        return;
+    }
+
+    if (terminal) {
+        this->terminate(lib::error_code());
+        return;
+    }
+
+    bool needs_writing = false;
+    {
+        scoped_lock_type lock(m_write_lock);
+
+        // release write flag
+        m_write_flag = false;
+
+        needs_writing = !m_send_queue.empty();
+    }
+
+    if (needs_writing) {
+        transport_con_type::dispatch(lib::bind(
+            &type::write_frame,
+            type::get_shared()
+        ));
+    }
+}
+
+template <typename config>
+std::vector<int> const & connection<config>::get_supported_versions() const
+{
+    return versions_supported;
+}
+
+template <typename config>
+void connection<config>::process_control_frame(typename config::message_type::ptr msg)
+{
+    m_alog.write(log::alevel::devel,"process_control_frame");
+
+    frame::opcode::value op = msg->get_opcode();
+    lib::error_code ec;
+
+    std::stringstream s;
+    s << "Control frame received with opcode " << op;
+    m_alog.write(log::alevel::control,s.str());
+
+    if (m_state == session::state::closed) {
+        m_elog.write(log::elevel::warn,"got frame in state closed");
+        return;
+    }
+    if (op != frame::opcode::CLOSE && m_state != session::state::open) {
+        m_elog.write(log::elevel::warn,"got non-close frame in state closing");
+        return;
+    }
+
+    if (op == frame::opcode::PING) {
+        bool should_reply = true;
+
+        if (m_ping_handler) {
+            should_reply = m_ping_handler(m_connection_hdl, msg->get_payload());
+        }
+
+        if (should_reply) {
+            this->pong(msg->get_payload(),ec);
+            if (ec) {
+                log_err(log::elevel::devel,"Failed to send response pong",ec);
+            }
+        }
+    } else if (op == frame::opcode::PONG) {
+        if (m_pong_handler) {
+            m_pong_handler(m_connection_hdl, msg->get_payload());
+        }
+        if (m_ping_timer) {
+            m_ping_timer->cancel();
+        }
+    } else if (op == frame::opcode::CLOSE) {
+        m_alog.write(log::alevel::devel,"got close frame");
+        // record close code and reason somewhere
+
+        m_remote_close_code = close::extract_code(msg->get_payload(),ec);
+        if (ec) {
+            s.str("");
+            if (config::drop_on_protocol_error) {
+                s << "Received invalid close code " << m_remote_close_code
+                  << " dropping connection per config.";
+                m_elog.write(log::elevel::devel,s.str());
+                this->terminate(ec);
+            } else {
+                s << "Received invalid close code " << m_remote_close_code
+                  << " sending acknowledgement and closing";
+                m_elog.write(log::elevel::devel,s.str());
+                ec = send_close_ack(close::status::protocol_error,
+                    "Invalid close code");
+                if (ec) {
+                    log_err(log::elevel::devel,"send_close_ack",ec);
+                }
+            }
+            return;
+        }
+
+        m_remote_close_reason = close::extract_reason(msg->get_payload(),ec);
+        if (ec) {
+            if (config::drop_on_protocol_error) {
+                m_elog.write(log::elevel::devel,
+                    "Received invalid close reason. Dropping connection per config");
+                this->terminate(ec);
+            } else {
+                m_elog.write(log::elevel::devel,
+                    "Received invalid close reason. Sending acknowledgement and closing");
+                ec = send_close_ack(close::status::protocol_error,
+                    "Invalid close reason");
+                if (ec) {
+                    log_err(log::elevel::devel,"send_close_ack",ec);
+                }
+            }
+            return;
+        }
+
+        if (m_state == session::state::open) {
+            s.str("");
+            s << "Received close frame with code " << m_remote_close_code
+              << " and reason " << m_remote_close_reason;
+            m_alog.write(log::alevel::devel,s.str());
+
+            ec = send_close_ack();
+            if (ec) {
+                log_err(log::elevel::devel,"send_close_ack",ec);
+            }
+        } else if (m_state == session::state::closing && !m_was_clean) {
+            // ack of our close
+            m_alog.write(log::alevel::devel, "Got acknowledgement of close");
+
+            m_was_clean = true;
+
+            // If we are a server terminate the connection now. Clients should
+            // leave the connection open to give the server an opportunity to
+            // initiate the TCP close. The client's timer will handle closing
+            // its side of the connection if the server misbehaves.
+            //
+            // TODO: different behavior if the underlying transport doesn't
+            // support timers?
+            if (m_is_server) {
+                terminate(lib::error_code());
+            }
+        } else {
+            // spurious, ignore
+            m_elog.write(log::elevel::devel, "Got close frame in wrong state");
+        }
+    } else {
+        // got an invalid control opcode
+        m_elog.write(log::elevel::devel, "Got control frame with invalid opcode");
+        // initiate protocol error shutdown
+    }
+}
+
+template <typename config>
+lib::error_code connection<config>::send_close_ack(close::status::value code,
+    std::string const & reason)
+{
+    return send_close_frame(code,reason,true,m_is_server);
+}
+
+template <typename config>
+lib::error_code connection<config>::send_close_frame(close::status::value code,
+    std::string const & reason, bool ack, bool terminal)
+{
+    m_alog.write(log::alevel::devel,"send_close_frame");
+
+    // check for special codes
+
+    // If silent close is set, respect it and blank out close information
+    // Otherwise use whatever has been specified in the parameters. If
+    // parameters specifies close::status::blank then determine what to do
+    // based on whether or not this is an ack. If it is not an ack just
+    // send blank info. If it is an ack then echo the close information from
+    // the remote endpoint.
+    if (config::silent_close) {
+        m_alog.write(log::alevel::devel,"closing silently");
+        m_local_close_code = close::status::no_status;
+        m_local_close_reason.clear();
+    } else if (code != close::status::blank) {
+        m_alog.write(log::alevel::devel,"closing with specified codes");
+        m_local_close_code = code;
+        m_local_close_reason = reason;
+    } else if (!ack) {
+        m_alog.write(log::alevel::devel,"closing with no status code");
+        m_local_close_code = close::status::no_status;
+        m_local_close_reason.clear();
+    } else if (m_remote_close_code == close::status::no_status) {
+        m_alog.write(log::alevel::devel,
+            "acknowledging a no-status close with normal code");
+        m_local_close_code = close::status::normal;
+        m_local_close_reason.clear();
+    } else {
+        m_alog.write(log::alevel::devel,"acknowledging with remote codes");
+        m_local_close_code = m_remote_close_code;
+        m_local_close_reason = m_remote_close_reason;
+    }
+
+    std::stringstream s;
+    s << "Closing with code: " << m_local_close_code << ", and reason: "
+      << m_local_close_reason;
+    m_alog.write(log::alevel::devel,s.str());
+
+    message_ptr msg = m_msg_manager->get_message();
+    if (!msg) {
+        return error::make_error_code(error::no_outgoing_buffers);
+    }
+
+    lib::error_code ec = m_processor->prepare_close(m_local_close_code,
+        m_local_close_reason,msg);
+    if (ec) {
+        return ec;
+    }
+
+    // Messages flagged terminal will result in the TCP connection being dropped
+    // after the message has been written. This is typically used when servers
+    // send an ack and when any endpoint encounters a protocol error
+    if (terminal) {
+        msg->set_terminal(true);
+    }
+
+    m_state = session::state::closing;
+
+    if (ack) {
+        m_was_clean = true;
+    }
+
+    // Start a timer so we don't wait forever for the acknowledgement close
+    // frame
+    if (m_close_handshake_timeout_dur > 0) {
+        m_handshake_timer = transport_con_type::set_timer(
+            m_close_handshake_timeout_dur,
+            lib::bind(
+                &type::handle_close_handshake_timeout,
+                type::get_shared(),
+                lib::placeholders::_1
+            )
+        );
+    }
+
+    bool needs_writing = false;
+    {
+        scoped_lock_type lock(m_write_lock);
+        write_push(msg);
+        needs_writing = !m_write_flag && !m_send_queue.empty();
+    }
+
+    if (needs_writing) {
+        transport_con_type::dispatch(lib::bind(
+            &type::write_frame,
+            type::get_shared()
+        ));
+    }
+
+    return lib::error_code();
+}
+
+template <typename config>
+typename connection<config>::processor_ptr
+connection<config>::get_processor(int version) const {
+    // TODO: allow disabling certain versions
+    
+    processor_ptr p;
+    
+    switch (version) {
+        case 0:
+            p = lib::make_shared<processor::hybi00<config> >(
+                transport_con_type::is_secure(),
+                m_is_server,
+                m_msg_manager
+            );
+            break;
+        case 7:
+            p = lib::make_shared<processor::hybi07<config> >(
+                transport_con_type::is_secure(),
+                m_is_server,
+                m_msg_manager,
+                lib::ref(m_rng)
+            );
+            break;
+        case 8:
+            p = lib::make_shared<processor::hybi08<config> >(
+                transport_con_type::is_secure(),
+                m_is_server,
+                m_msg_manager,
+                lib::ref(m_rng)
+            );
+            break;
+        case 13:
+            p = lib::make_shared<processor::hybi13<config> >(
+                transport_con_type::is_secure(),
+                m_is_server,
+                m_msg_manager,
+                lib::ref(m_rng)
+            );
+            break;
+        default:
+            return p;
+    }
+    
+    // Settings not configured by the constructor
+    p->set_max_message_size(m_max_message_size);
+    
+    return p;
+}
+
+template <typename config>
+void connection<config>::write_push(typename config::message_type::ptr msg)
+{
+    if (!msg) {
+        return;
+    }
+
+    m_send_buffer_size += msg->get_payload().size();
+    m_send_queue.push(msg);
+
+    if (m_alog.static_test(log::alevel::devel)) {
+        std::stringstream s;
+        s << "write_push: message count: " << m_send_queue.size()
+          << " buffer size: " << m_send_buffer_size;
+        m_alog.write(log::alevel::devel,s.str());
+    }
+}
+
+template <typename config>
+typename config::message_type::ptr connection<config>::write_pop()
+{
+    message_ptr msg;
+
+    if (m_send_queue.empty()) {
+        return msg;
+    }
+
+    msg = m_send_queue.front();
+
+    m_send_buffer_size -= msg->get_payload().size();
+    m_send_queue.pop();
+
+    if (m_alog.static_test(log::alevel::devel)) {
+        std::stringstream s;
+        s << "write_pop: message count: " << m_send_queue.size()
+          << " buffer size: " << m_send_buffer_size;
+        m_alog.write(log::alevel::devel,s.str());
+    }
+    return msg;
+}
+
+template <typename config>
+void connection<config>::log_open_result()
+{
+    std::stringstream s;
+
+    int version;
+    if (!processor::is_websocket_handshake(m_request)) {
+        version = -1;
+    } else {
+        version = processor::get_websocket_version(m_request);
+    }
+
+    // Connection Type
+    s << (version == -1 ? "HTTP" : "WebSocket") << " Connection ";
+
+    // Remote endpoint address
+    s << transport_con_type::get_remote_endpoint() << " ";
+
+    // Version string if WebSocket
+    if (version != -1) {
+        s << "v" << version << " ";
+    }
+
+    // User Agent
+    std::string ua = m_request.get_header("User-Agent");
+    if (ua.empty()) {
+        s << "\"\" ";
+    } else {
+        // check if there are any quotes in the user agent
+        s << "\"" << utility::string_replace_all(ua,"\"","\\\"") << "\" ";
+    }
+
+    // URI
+    s << (m_uri ? m_uri->get_resource() : "NULL") << " ";
+
+    // Status code
+    s << m_response.get_status_code();
+
+    m_alog.write(log::alevel::connect,s.str());
+}
+
+template <typename config>
+void connection<config>::log_close_result()
+{
+    std::stringstream s;
+
+    s << "Disconnect "
+      << "close local:[" << m_local_close_code
+      << (m_local_close_reason.empty() ? "" : ","+m_local_close_reason)
+      << "] remote:[" << m_remote_close_code
+      << (m_remote_close_reason.empty() ? "" : ","+m_remote_close_reason) << "]";
+
+    m_alog.write(log::alevel::disconnect,s.str());
+}
+
+template <typename config>
+void connection<config>::log_fail_result()
+{
+    std::stringstream s;
+    
+    int version = processor::get_websocket_version(m_request);
+
+    // Connection Type
+    s << "WebSocket Connection ";
+
+    // Remote endpoint address & WebSocket version
+    s << transport_con_type::get_remote_endpoint();
+    if (version < 0) {
+        s << " -";
+    } else {
+        s << " v" << version;
+    }
+
+    // User Agent
+    std::string ua = m_request.get_header("User-Agent");
+    if (ua.empty()) {
+        s << " \"\" ";
+    } else {
+        // check if there are any quotes in the user agent
+        s << " \"" << utility::string_replace_all(ua,"\"","\\\"") << "\" ";
+    }
+
+    // URI
+    s << (m_uri ? m_uri->get_resource() : "-");
+
+    // HTTP Status code
+    s  << " " << m_response.get_status_code();
+    
+    // WebSocket++ error code & reason
+    s << " " << m_ec << " " << m_ec.message();
+
+    m_alog.write(log::alevel::fail,s.str());
+}
+
+template <typename config>
+void connection<config>::log_http_result() {
+    std::stringstream s;
+
+    if (processor::is_websocket_handshake(m_request)) {
+        m_alog.write(log::alevel::devel,"Call to log_http_result for WebSocket");
+        return;
+    }  
+
+    // Connection Type
+    s << (m_request.get_header("host").empty() ? "-" : m_request.get_header("host"))
+      << " " << transport_con_type::get_remote_endpoint()
+      << " \"" << m_request.get_method() 
+      << " " << (m_uri ? m_uri->get_resource() : "-") 
+      << " " << m_request.get_version() << "\" " << m_response.get_status_code()
+      << " " << m_response.get_body().size();
+    
+    // User Agent
+    std::string ua = m_request.get_header("User-Agent");
+    if (ua.empty()) {
+        s << " \"\" ";
+    } else {
+        // check if there are any quotes in the user agent
+        s << " \"" << utility::string_replace_all(ua,"\"","\\\"") << "\" ";
+    }
+
+    m_alog.write(log::alevel::http,s.str());
+}
+
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_CONNECTION_IMPL_HPP
diff --git a/vendor/websocketpp/websocketpp/impl/endpoint_impl.hpp b/vendor/websocketpp/websocketpp/impl/endpoint_impl.hpp
new file mode 100644
index 0000000..e09cda9
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/impl/endpoint_impl.hpp
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_ENDPOINT_IMPL_HPP
+#define WEBSOCKETPP_ENDPOINT_IMPL_HPP
+
+#include <string>
+
+namespace websocketpp {
+
+template <typename connection, typename config>
+typename endpoint<connection,config>::connection_ptr
+endpoint<connection,config>::create_connection() {
+    m_alog.write(log::alevel::devel,"create_connection");
+    //scoped_lock_type lock(m_state_lock);
+
+    /*if (m_state == STOPPING || m_state == STOPPED) {
+        return connection_ptr();
+    }*/
+
+    //scoped_lock_type guard(m_mutex);
+    // Create a connection on the heap and manage it using a shared pointer
+    connection_ptr con = lib::make_shared<connection_type>(m_is_server,
+        m_user_agent, lib::ref(m_alog), lib::ref(m_elog), lib::ref(m_rng));
+
+    connection_weak_ptr w(con);
+
+    // Create a weak pointer on the heap using that shared_ptr.
+    // Cast that weak pointer to void* and manage it using another shared_ptr
+    // connection_hdl hdl(reinterpret_cast<void*>(new connection_weak_ptr(con)));
+
+    con->set_handle(w);
+
+    // Copy default handlers from the endpoint
+    con->set_open_handler(m_open_handler);
+    con->set_close_handler(m_close_handler);
+    con->set_fail_handler(m_fail_handler);
+    con->set_ping_handler(m_ping_handler);
+    con->set_pong_handler(m_pong_handler);
+    con->set_pong_timeout_handler(m_pong_timeout_handler);
+    con->set_interrupt_handler(m_interrupt_handler);
+    con->set_http_handler(m_http_handler);
+    con->set_validate_handler(m_validate_handler);
+    con->set_message_handler(m_message_handler);
+
+    if (m_open_handshake_timeout_dur != config::timeout_open_handshake) {
+        con->set_open_handshake_timeout(m_open_handshake_timeout_dur);
+    }
+    if (m_close_handshake_timeout_dur != config::timeout_close_handshake) {
+        con->set_close_handshake_timeout(m_close_handshake_timeout_dur);
+    }
+    if (m_pong_timeout_dur != config::timeout_pong) {
+        con->set_pong_timeout(m_pong_timeout_dur);
+    }
+    if (m_max_message_size != config::max_message_size) {
+        con->set_max_message_size(m_max_message_size);
+    }
+    con->set_max_http_body_size(m_max_http_body_size);
+
+    lib::error_code ec;
+
+    ec = transport_type::init(con);
+    if (ec) {
+        m_elog.write(log::elevel::fatal,ec.message());
+        return connection_ptr();
+    }
+
+    return con;
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::interrupt(connection_hdl hdl, lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+
+    m_alog.write(log::alevel::devel,"Interrupting connection");
+
+    ec = con->interrupt();
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::interrupt(connection_hdl hdl) {
+    lib::error_code ec;
+    interrupt(hdl,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::pause_reading(connection_hdl hdl, lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+
+    ec = con->pause_reading();
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::pause_reading(connection_hdl hdl) {
+    lib::error_code ec;
+    pause_reading(hdl,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::resume_reading(connection_hdl hdl, lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+
+    ec = con->resume_reading();
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::resume_reading(connection_hdl hdl) {
+    lib::error_code ec;
+    resume_reading(hdl,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::send_http_response(connection_hdl hdl,
+    lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+    con->send_http_response(ec);
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::send_http_response(connection_hdl hdl) {
+    lib::error_code ec;
+    send_http_response(hdl,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::send(connection_hdl hdl, std::string const & payload,
+    frame::opcode::value op, lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+
+    ec = con->send(payload,op);
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::send(connection_hdl hdl, std::string const & payload,
+    frame::opcode::value op)
+{
+    lib::error_code ec;
+    send(hdl,payload,op,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::send(connection_hdl hdl, void const * payload,
+    size_t len, frame::opcode::value op, lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+    ec = con->send(payload,len,op);
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::send(connection_hdl hdl, void const * payload,
+    size_t len, frame::opcode::value op)
+{
+    lib::error_code ec;
+    send(hdl,payload,len,op,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::send(connection_hdl hdl, message_ptr msg,
+    lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+    ec = con->send(msg);
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::send(connection_hdl hdl, message_ptr msg) {
+    lib::error_code ec;
+    send(hdl,msg,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
+    const code, std::string const & reason,
+    lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+    con->close(code,reason,ec);
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::close(connection_hdl hdl, close::status::value
+    const code, std::string const & reason)
+{
+    lib::error_code ec;
+    close(hdl,code,reason,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::ping(connection_hdl hdl, std::string const &
+    payload, lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+    con->ping(payload,ec);
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::ping(connection_hdl hdl, std::string const & payload)
+{
+    lib::error_code ec;
+    ping(hdl,payload,ec);
+    if (ec) { throw exception(ec); }
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::pong(connection_hdl hdl, std::string const & payload,
+    lib::error_code & ec)
+{
+    connection_ptr con = get_con_from_hdl(hdl,ec);
+    if (ec) {return;}
+    con->pong(payload,ec);
+}
+
+template <typename connection, typename config>
+void endpoint<connection,config>::pong(connection_hdl hdl, std::string const & payload)
+{
+    lib::error_code ec;
+    pong(hdl,payload,ec);
+    if (ec) { throw exception(ec); }
+}
+
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_ENDPOINT_IMPL_HPP
diff --git a/vendor/websocketpp/websocketpp/impl/utilities_impl.hpp b/vendor/websocketpp/websocketpp/impl/utilities_impl.hpp
new file mode 100644
index 0000000..6f86e22
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/impl/utilities_impl.hpp
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_UTILITIES_IMPL_HPP
+#define WEBSOCKETPP_UTILITIES_IMPL_HPP
+
+#include <algorithm>
+#include <string>
+
+namespace websocketpp {
+namespace utility {
+
+inline std::string to_lower(std::string const & in) {
+    std::string out = in;
+    std::transform(out.begin(),out.end(),out.begin(),::tolower);
+    return out;
+}
+
+inline std::string to_hex(std::string const & input) {
+    std::string output;
+    std::string hex = "0123456789ABCDEF";
+
+    for (size_t i = 0; i < input.size(); i++) {
+        output += hex[(input[i] & 0xF0) >> 4];
+        output += hex[input[i] & 0x0F];
+        output += " ";
+    }
+
+    return output;
+}
+
+inline std::string to_hex(uint8_t const * input, size_t length) {
+    std::string output;
+    std::string hex = "0123456789ABCDEF";
+
+    for (size_t i = 0; i < length; i++) {
+        output += hex[(input[i] & 0xF0) >> 4];
+        output += hex[input[i] & 0x0F];
+        output += " ";
+    }
+
+    return output;
+}
+
+inline std::string to_hex(const char* input,size_t length) {
+    return to_hex(reinterpret_cast<const uint8_t*>(input),length);
+}
+
+inline std::string string_replace_all(std::string subject, std::string const &
+    search, std::string const & replace)
+{
+    size_t pos = 0;
+    while((pos = subject.find(search, pos)) != std::string::npos) {
+         subject.replace(pos, search.length(), replace);
+         pos += replace.length();
+    }
+    return subject;
+}
+
+} // namespace utility
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_UTILITIES_IMPL_HPP
diff --git a/vendor/websocketpp/websocketpp/logger/basic.hpp b/vendor/websocketpp/websocketpp/logger/basic.hpp
new file mode 100644
index 0000000..8451413
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/logger/basic.hpp
@@ -0,0 +1,199 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_LOGGER_BASIC_HPP
+#define WEBSOCKETPP_LOGGER_BASIC_HPP
+
+/* Need a way to print a message to the log
+ *
+ * - timestamps
+ * - channels
+ * - thread safe
+ * - output to stdout or file
+ * - selective output channels, both compile time and runtime
+ * - named channels
+ * - ability to test whether a log message will be printed at compile time
+ *
+ */
+
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/stdint.hpp>
+#include <websocketpp/common/time.hpp>
+
+#include <ctime>
+#include <iostream>
+#include <iomanip>
+#include <string>
+
+namespace websocketpp {
+namespace log {
+
+/// Basic logger that outputs to an ostream
+template <typename concurrency, typename names>
+class basic {
+public:
+    basic<concurrency,names>(channel_type_hint::value h =
+        channel_type_hint::access)
+      : m_static_channels(0xffffffff)
+      , m_dynamic_channels(0)
+      , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
+
+    basic<concurrency,names>(std::ostream * out)
+      : m_static_channels(0xffffffff)
+      , m_dynamic_channels(0)
+      , m_out(out) {}
+
+    basic<concurrency,names>(level c, channel_type_hint::value h =
+        channel_type_hint::access)
+      : m_static_channels(c)
+      , m_dynamic_channels(0)
+      , m_out(h == channel_type_hint::error ? &std::cerr : &std::cout) {}
+
+    basic<concurrency,names>(level c, std::ostream * out)
+      : m_static_channels(c)
+      , m_dynamic_channels(0)
+      , m_out(out) {}
+
+    /// Destructor
+    ~basic<concurrency,names>() {}
+
+    /// Copy constructor
+    basic<concurrency,names>(basic<concurrency,names> const & other)
+     : m_static_channels(other.m_static_channels)
+     , m_dynamic_channels(other.m_dynamic_channels)
+     , m_out(other.m_out)
+    {}
+    
+#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+    // no copy assignment operator because of const member variables
+    basic<concurrency,names> & operator=(basic<concurrency,names> const &) = delete;
+#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+
+#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+    /// Move constructor
+    basic<concurrency,names>(basic<concurrency,names> && other)
+     : m_static_channels(other.m_static_channels)
+     , m_dynamic_channels(other.m_dynamic_channels)
+     , m_out(other.m_out)
+    {}
+
+#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+    // no move assignment operator because of const member variables
+    basic<concurrency,names> & operator=(basic<concurrency,names> &&) = delete;
+#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+
+#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
+
+    void set_ostream(std::ostream * out = &std::cout) {
+        m_out = out;
+    }
+
+    void set_channels(level channels) {
+        if (channels == names::none) {
+            clear_channels(names::all);
+            return;
+        }
+
+        scoped_lock_type lock(m_lock);
+        m_dynamic_channels |= (channels & m_static_channels);
+    }
+
+    void clear_channels(level channels) {
+        scoped_lock_type lock(m_lock);
+        m_dynamic_channels &= ~channels;
+    }
+
+    /// Write a string message to the given channel
+    /**
+     * @param channel The channel to write to
+     * @param msg The message to write
+     */
+    void write(level channel, std::string const & msg) {
+        scoped_lock_type lock(m_lock);
+        if (!this->dynamic_test(channel)) { return; }
+        *m_out << "[" << timestamp << "] "
+                  << "[" << names::channel_name(channel) << "] "
+                  << msg << "\n";
+        m_out->flush();
+    }
+
+    /// Write a cstring message to the given channel
+    /**
+     * @param channel The channel to write to
+     * @param msg The message to write
+     */
+    void write(level channel, char const * msg) {
+        scoped_lock_type lock(m_lock);
+        if (!this->dynamic_test(channel)) { return; }
+        *m_out << "[" << timestamp << "] "
+                  << "[" << names::channel_name(channel) << "] "
+                  << msg << "\n";
+        m_out->flush();
+    }
+
+    _WEBSOCKETPP_CONSTEXPR_TOKEN_ bool static_test(level channel) const {
+        return ((channel & m_static_channels) != 0);
+    }
+
+    bool dynamic_test(level channel) {
+        return ((channel & m_dynamic_channels) != 0);
+    }
+
+protected:
+    typedef typename concurrency::scoped_lock_type scoped_lock_type;
+    typedef typename concurrency::mutex_type mutex_type;
+    mutex_type m_lock;
+
+private:
+    // The timestamp does not include the time zone, because on Windows with the
+    // default registry settings, the time zone would be written out in full,
+    // which would be obnoxiously verbose.
+    //
+    // TODO: find a workaround for this or make this format user settable
+    static std::ostream & timestamp(std::ostream & os) {
+        std::time_t t = std::time(NULL);
+        std::tm lt = lib::localtime(t);
+        #ifdef _WEBSOCKETPP_PUTTIME_
+            return os << std::put_time(&lt,"%Y-%m-%d %H:%M:%S");
+        #else // Falls back to strftime, which requires a temporary copy of the string.
+            char buffer[20];
+            size_t result = std::strftime(buffer,sizeof(buffer),"%Y-%m-%d %H:%M:%S",&lt);
+            return os << (result == 0 ? "Unknown" : buffer);
+        #endif
+    }
+
+    level const m_static_channels;
+    level m_dynamic_channels;
+    std::ostream * m_out;
+};
+
+} // log
+} // websocketpp
+
+#endif // WEBSOCKETPP_LOGGER_BASIC_HPP
diff --git a/vendor/websocketpp/websocketpp/logger/levels.hpp b/vendor/websocketpp/websocketpp/logger/levels.hpp
new file mode 100644
index 0000000..cd7ccd6
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/logger/levels.hpp
@@ -0,0 +1,203 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_LOGGER_LEVELS_HPP
+#define WEBSOCKETPP_LOGGER_LEVELS_HPP
+
+#include <websocketpp/common/stdint.hpp>
+
+namespace websocketpp {
+namespace log {
+
+/// Type of a channel package
+typedef uint32_t level;
+
+/// Package of values for hinting at the nature of a given logger.
+/**
+ * Used by the library to signal to the logging class a hint that it can use to
+ * set itself up. For example, the `access` hint indicates that it is an access
+ * log that might be suitable for being printed to an access log file or to cout
+ * whereas `error` might be suitable for an error log file or cerr. 
+ */
+struct channel_type_hint {
+    /// Type of a channel type hint value
+    typedef uint32_t value;
+    
+    /// No information
+    static value const none = 0;
+    /// Access log
+    static value const access = 1;
+    /// Error log
+    static value const error = 2;
+};
+
+/// Package of log levels for logging errors
+struct elevel {
+    /// Special aggregate value representing "no levels"
+    static level const none = 0x0;
+    /// Low level debugging information (warning: very chatty)
+    static level const devel = 0x1;
+    /// Information about unusual system states or other minor internal library
+    /// problems, less chatty than devel.
+    static level const library = 0x2;
+    /// Information about minor configuration problems or additional information
+    /// about other warnings.
+    static level const info = 0x4;
+    /// Information about important problems not severe enough to terminate
+    /// connections.
+    static level const warn = 0x8;
+    /// Recoverable error. Recovery may mean cleanly closing the connection with
+    /// an appropriate error code to the remote endpoint.
+    static level const rerror = 0x10;
+    /// Unrecoverable error. This error will trigger immediate unclean
+    /// termination of the connection or endpoint.
+    static level const fatal = 0x20;
+    /// Special aggregate value representing "all levels"
+    static level const all = 0xffffffff;
+
+    /// Get the textual name of a channel given a channel id
+    /**
+     * The id must be that of a single channel. Passing an aggregate channel
+     * package results in undefined behavior.
+     *
+     * @param channel The channel id to look up.
+     *
+     * @return The name of the specified channel.
+     */
+    static char const * channel_name(level channel) {
+        switch(channel) {
+            case devel:
+                return "devel";
+            case library:
+                return "library";
+            case info:
+                return "info";
+            case warn:
+                return "warning";
+            case rerror:
+                return "error";
+            case fatal:
+                return "fatal";
+            default:
+                return "unknown";
+        }
+    }
+};
+
+/// Package of log levels for logging access events
+struct alevel {
+    /// Special aggregate value representing "no levels"
+    static level const none = 0x0;
+    /// Information about new connections
+    /**
+     * One line for each new connection that includes a host of information
+     * including: the remote address, websocket version, requested resource,
+     * http code, remote user agent
+     */
+    static level const connect = 0x1;
+    /// One line for each closed connection. Includes closing codes and reasons.
+    static level const disconnect = 0x2;
+    /// One line per control frame
+    static level const control = 0x4;
+    /// One line per frame, includes the full frame header
+    static level const frame_header = 0x8;
+    /// One line per frame, includes the full message payload (warning: chatty)
+    static level const frame_payload = 0x10;
+    /// Reserved
+    static level const message_header = 0x20;
+    /// Reserved
+    static level const message_payload = 0x40;
+    /// Reserved
+    static level const endpoint = 0x80;
+    /// Extra information about opening handshakes
+    static level const debug_handshake = 0x100;
+    /// Extra information about closing handshakes
+    static level const debug_close = 0x200;
+    /// Development messages (warning: very chatty)
+    static level const devel = 0x400;
+    /// Special channel for application specific logs. Not used by the library.
+    static level const app = 0x800;
+    /// Access related to HTTP requests
+    static level const http = 0x1000;
+    /// One line for each failed WebSocket connection with details
+    static level const fail = 0x2000;
+    /// Aggregate package representing the commonly used core access channels
+    /// Connect, Disconnect, Fail, and HTTP
+    static level const access_core = 0x00003003;
+    /// Special aggregate value representing "all levels"
+    static level const all = 0xffffffff;
+
+    /// Get the textual name of a channel given a channel id
+    /**
+     * Get the textual name of a channel given a channel id. The id must be that
+     * of a single channel. Passing an aggregate channel package results in
+     * undefined behavior.
+     *
+     * @param channel The channelid to look up.
+     *
+     * @return The name of the specified channel.
+     */
+    static char const * channel_name(level channel) {
+        switch(channel) {
+            case connect:
+                return "connect";
+            case disconnect:
+                return "disconnect";
+            case control:
+                return "control";
+            case frame_header:
+                return "frame_header";
+            case frame_payload:
+                return "frame_payload";
+            case message_header:
+                return "message_header";
+            case message_payload:
+                return "message_payload";
+            case endpoint:
+                return "endpoint";
+            case debug_handshake:
+                return "debug_handshake";
+            case debug_close:
+                return "debug_close";
+            case devel:
+                return "devel";
+            case app:
+                return "application";
+            case http:
+                return "http";
+            case fail:
+                return "fail";
+            default:
+                return "unknown";
+        }
+    }
+};
+
+} // logger
+} // websocketpp
+
+#endif //WEBSOCKETPP_LOGGER_LEVELS_HPP
diff --git a/vendor/websocketpp/websocketpp/logger/stub.hpp b/vendor/websocketpp/websocketpp/logger/stub.hpp
new file mode 100644
index 0000000..2db6da7
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/logger/stub.hpp
@@ -0,0 +1,119 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_LOGGER_STUB_HPP
+#define WEBSOCKETPP_LOGGER_STUB_HPP
+
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/cpp11.hpp>
+
+#include <string>
+
+namespace websocketpp {
+namespace log {
+
+/// Stub logger that ignores all input
+class stub {
+public:
+    /// Construct the logger
+    /**
+     * @param hint A channel type specific hint for how to construct the logger
+     */
+    explicit stub(channel_type_hint::value) {}
+
+    /// Construct the logger
+    /**
+     * @param default_channels A set of channels to statically enable
+     * @param hint A channel type specific hint for how to construct the logger
+     */
+    stub(level, channel_type_hint::value) {}
+    _WEBSOCKETPP_CONSTEXPR_TOKEN_ stub() {}
+
+    /// Dynamically enable the given list of channels
+    /**
+     * All operations on the stub logger are no-ops and all arguments are
+     * ignored
+     *
+     * @param channels The package of channels to enable
+     */
+    void set_channels(level) {}
+
+    /// Dynamically disable the given list of channels
+    /**
+     * All operations on the stub logger are no-ops and all arguments are
+     * ignored
+     *
+     * @param channels The package of channels to disable
+     */
+    void clear_channels(level) {}
+
+    /// Write a string message to the given channel
+    /**
+     * Writing on the stub logger is a no-op and all arguments are ignored
+     *
+     * @param channel The channel to write to
+     * @param msg The message to write
+     */
+    void write(level, std::string const &) {}
+
+    /// Write a cstring message to the given channel
+    /**
+     * Writing on the stub logger is a no-op and all arguments are ignored
+     *
+     * @param channel The channel to write to
+     * @param msg The message to write
+     */
+    void write(level, char const *) {}
+
+    /// Test whether a channel is statically enabled
+    /**
+     * The stub logger has no channels so all arguments are ignored and
+     * `static_test` always returns false.
+     *
+     * @param channel The package of channels to test
+     */
+    _WEBSOCKETPP_CONSTEXPR_TOKEN_ bool static_test(level) const {
+        return false;
+    }
+
+    /// Test whether a channel is dynamically enabled
+    /**
+     * The stub logger has no channels so all arguments are ignored and
+     * `dynamic_test` always returns false.
+     *
+     * @param channel The package of channels to test
+     */
+    bool dynamic_test(level) {
+        return false;
+    }
+};
+
+} // log
+} // websocketpp
+
+#endif // WEBSOCKETPP_LOGGER_STUB_HPP
diff --git a/vendor/websocketpp/websocketpp/logger/syslog.hpp b/vendor/websocketpp/websocketpp/logger/syslog.hpp
new file mode 100644
index 0000000..513abee
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/logger/syslog.hpp
@@ -0,0 +1,146 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *
+ * The initial version of this logging policy was contributed to the WebSocket++
+ * project by Tom Hughes.
+ */
+
+#ifndef WEBSOCKETPP_LOGGER_SYSLOG_HPP
+#define WEBSOCKETPP_LOGGER_SYSLOG_HPP
+
+#include <syslog.h>
+
+#include <websocketpp/logger/basic.hpp>
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/logger/levels.hpp>
+
+namespace websocketpp {
+namespace log {
+
+/// Basic logger that outputs to syslog
+template <typename concurrency, typename names>
+class syslog : public basic<concurrency, names> {
+public:
+    typedef basic<concurrency, names> base;
+
+    /// Construct the logger
+    /**
+     * @param hint A channel type specific hint for how to construct the logger
+     */
+    syslog<concurrency,names>(channel_type_hint::value hint =
+        channel_type_hint::access)
+      : basic<concurrency,names>(hint), m_channel_type_hint(hint) {}
+
+    /// Construct the logger
+    /**
+     * @param channels A set of channels to statically enable
+     * @param hint A channel type specific hint for how to construct the logger
+     */
+    syslog<concurrency,names>(level channels, channel_type_hint::value hint =
+        channel_type_hint::access)
+      : basic<concurrency,names>(channels, hint), m_channel_type_hint(hint) {}
+
+    /// Write a string message to the given channel
+    /**
+     * @param channel The channel to write to
+     * @param msg The message to write
+     */
+    void write(level channel, std::string const & msg) {
+        write(channel, msg.c_str());
+    }
+
+    /// Write a cstring message to the given channel
+    /**
+     * @param channel The channel to write to
+     * @param msg The message to write
+     */
+    void write(level channel, char const * msg) {
+        scoped_lock_type lock(base::m_lock);
+        if (!this->dynamic_test(channel)) { return; }
+        ::syslog(syslog_priority(channel), "[%s] %s",
+            names::channel_name(channel), msg);
+    }
+private:
+    typedef typename base::scoped_lock_type scoped_lock_type;
+
+    /// The default level is used for all access logs and any error logs that
+    /// don't trivially map to one of the standard syslog levels.
+    static int const default_level = LOG_INFO;
+
+    /// retrieve the syslog priority code given a WebSocket++ channel
+    /**
+     * @param channel The level to look up
+     * @return The syslog level associated with `channel`
+     */
+    int syslog_priority(level channel) const {
+        if (m_channel_type_hint == channel_type_hint::access) {
+            return syslog_priority_access(channel);
+        } else {
+            return syslog_priority_error(channel);
+        }
+    }
+
+    /// retrieve the syslog priority code given a WebSocket++ error channel
+    /**
+     * @param channel The level to look up
+     * @return The syslog level associated with `channel`
+     */
+    int syslog_priority_error(level channel) const {
+        switch (channel) {
+            case elevel::devel:
+                return LOG_DEBUG;
+            case elevel::library:
+                return LOG_DEBUG;
+            case elevel::info:
+                return LOG_INFO;
+            case elevel::warn:
+                return LOG_WARNING;
+            case elevel::rerror:
+                return LOG_ERR;
+            case elevel::fatal:
+                return LOG_CRIT;
+            default:
+                return default_level;
+        }
+    }
+
+    /// retrieve the syslog priority code given a WebSocket++ access channel
+    /**
+     * @param channel The level to look up
+     * @return The syslog level associated with `channel`
+     */
+    _WEBSOCKETPP_CONSTEXPR_TOKEN_ int syslog_priority_access(level) const {
+        return default_level;
+    }
+
+    channel_type_hint::value m_channel_type_hint;
+};
+
+} // log
+} // websocketpp
+
+#endif // WEBSOCKETPP_LOGGER_SYSLOG_HPP
diff --git a/vendor/websocketpp/websocketpp/message_buffer/alloc.hpp b/vendor/websocketpp/websocketpp/message_buffer/alloc.hpp
new file mode 100644
index 0000000..75d8976
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/message_buffer/alloc.hpp
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
+#define WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
+
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/frame.hpp>
+
+namespace websocketpp {
+namespace message_buffer {
+namespace alloc {
+
+/// A connection message manager that allocates a new message for each
+/// request.
+template <typename message>
+class con_msg_manager
+  : public lib::enable_shared_from_this<con_msg_manager<message> >
+{
+public:
+    typedef con_msg_manager<message> type;
+    typedef lib::shared_ptr<con_msg_manager> ptr;
+    typedef lib::weak_ptr<con_msg_manager> weak_ptr;
+
+    typedef typename message::ptr message_ptr;
+
+    /// Get an empty message buffer
+    /**
+     * @return A shared pointer to an empty new message
+     */
+    message_ptr get_message() {
+        return message_ptr(lib::make_shared<message>(type::shared_from_this()));
+    }
+
+    /// Get a message buffer with specified size and opcode
+    /**
+     * @param op The opcode to use
+     * @param size Minimum size in bytes to request for the message payload.
+     *
+     * @return A shared pointer to a new message with specified size.
+     */
+    message_ptr get_message(frame::opcode::value op,size_t size) {
+        return message_ptr(lib::make_shared<message>(type::shared_from_this(),op,size));
+    }
+
+    /// Recycle a message
+    /**
+     * This method shouldn't be called. If it is, return false to indicate an
+     * error. The rest of the method recycle chain should notice this and free
+     * the memory.
+     *
+     * @param msg The message to be recycled.
+     *
+     * @return true if the message was successfully recycled, false otherwse.
+     */
+    bool recycle(message *) {
+        return false;
+    }
+};
+
+/// An endpoint message manager that allocates a new manager for each
+/// connection.
+template <typename con_msg_manager>
+class endpoint_msg_manager {
+public:
+    typedef typename con_msg_manager::ptr con_msg_man_ptr;
+
+    /// Get a pointer to a connection message manager
+    /**
+     * @return A pointer to the requested connection message manager.
+     */
+    con_msg_man_ptr get_manager() const {
+        return con_msg_man_ptr(lib::make_shared<con_msg_manager>());
+    }
+};
+
+} // namespace alloc
+} // namespace message_buffer
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
diff --git a/vendor/websocketpp/websocketpp/message_buffer/message.hpp b/vendor/websocketpp/websocketpp/message_buffer/message.hpp
new file mode 100644
index 0000000..da36e20
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/message_buffer/message.hpp
@@ -0,0 +1,340 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_MESSAGE_BUFFER_MESSAGE_HPP
+#define WEBSOCKETPP_MESSAGE_BUFFER_MESSAGE_HPP
+
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/frame.hpp>
+
+#include <string>
+
+namespace websocketpp {
+namespace message_buffer {
+
+/* # message:
+ * object that stores a message while it is being sent or received. Contains
+ * the message payload itself, the message header, the extension data, and the
+ * opcode.
+ *
+ * # connection_message_manager:
+ * An object that manages all of the message_buffers associated with a given
+ * connection. Implements the get_message_buffer(size) method that returns
+ * a message buffer at least size bytes long.
+ *
+ * Message buffers are reference counted with shared ownership semantics. Once
+ * requested from the manager the requester and it's associated downstream code
+ * may keep a pointer to the message indefinitely at a cost of extra resource
+ * usage. Once the reference count drops to the point where the manager is the
+ * only reference the messages is recycled using whatever method is implemented
+ * in the manager.
+ *
+ * # endpoint_message_manager:
+ * An object that manages connection_message_managers. Implements the
+ * get_message_manager() method. This is used once by each connection to
+ * request the message manager that they are supposed to use to manage message
+ * buffers for their own use.
+ *
+ * TYPES OF CONNECTION_MESSAGE_MANAGERS
+ * - allocate a message with the exact size every time one is requested
+ * - maintain a pool of pre-allocated messages and return one when needed.
+ *   Recycle previously used messages back into the pool
+ *
+ * TYPES OF ENDPOINT_MESSAGE_MANAGERS
+ *  - allocate a new connection manager for each connection. Message pools
+ *    become connection specific. This increases memory usage but improves
+ *    concurrency.
+ *  - allocate a single connection manager and share a pointer to it with all
+ *    connections created by this endpoint. The message pool will be shared
+ *    among all connections, improving memory usage and performance at the cost
+ *    of reduced concurrency
+ */
+
+
+/// Represents a buffer for a single WebSocket message.
+/**
+ *
+ *
+ */
+template <template<class> class con_msg_manager>
+class message {
+public:
+    typedef lib::shared_ptr<message> ptr;
+
+    typedef con_msg_manager<message> con_msg_man_type;
+    typedef typename con_msg_man_type::ptr con_msg_man_ptr;
+    typedef typename con_msg_man_type::weak_ptr con_msg_man_weak_ptr;
+
+    /// Construct an empty message
+    /**
+     * Construct an empty message
+     */
+    message(const con_msg_man_ptr manager)
+      : m_manager(manager)
+      , m_prepared(false)
+      , m_fin(true)
+      , m_terminal(false)
+      , m_compressed(false) {}
+
+    /// Construct a message and fill in some values
+    /**
+     *
+     */
+    message(const con_msg_man_ptr manager, frame::opcode::value op, size_t size = 128)
+      : m_manager(manager)
+      , m_opcode(op)
+      , m_prepared(false)
+      , m_fin(true)
+      , m_terminal(false)
+      , m_compressed(false)
+    {
+        m_payload.reserve(size);
+    }
+
+    /// Return whether or not the message has been prepared for sending
+    /**
+     * The prepared flag indicates that the message has been prepared by a
+     * websocket protocol processor and is ready to be written to the wire.
+     *
+     * @return whether or not the message has been prepared for sending
+     */
+    bool get_prepared() const {
+        return m_prepared;
+    }
+
+    /// Set or clear the flag that indicates that the message has been prepared
+    /**
+     * This flag should not be set by end user code without a very good reason.
+     *
+     * @param value The value to set the prepared flag to
+     */
+    void set_prepared(bool value) {
+        m_prepared = value;
+    }
+
+    /// Return whether or not the message is flagged as compressed
+    /**
+     * @return whether or not the message is/should be compressed
+     */
+    bool get_compressed() const {
+        return m_compressed;
+    }
+
+    /// Set or clear the compression flag
+    /**
+     * Setting the compression flag indicates that the data in this message
+     * would benefit from compression. If both endpoints negotiate a compression
+     * extension WebSocket++ will attempt to compress messages with this flag.
+     * Setting this flag does not guarantee that the message will be compressed.
+     *
+     * @param value The value to set the compressed flag to
+     */
+    void set_compressed(bool value) {
+        m_compressed = value;
+    }
+
+    /// Get whether or not the message is terminal
+    /**
+     * Messages can be flagged as terminal, which results in the connection
+     * being close after they are written rather than the implementation going
+     * on to the next message in the queue. This is typically used internally
+     * for close messages only.
+     *
+     * @return Whether or not this message is marked terminal
+     */
+    bool get_terminal() const {
+        return m_terminal;
+    }
+
+    /// Set the terminal flag
+    /**
+     * This flag should not be set by end user code without a very good reason.
+     *
+     * @see get_terminal()
+     *
+     * @param value The value to set the terminal flag to.
+     */
+    void set_terminal(bool value) {
+        m_terminal = value;
+    }
+    /// Read the fin bit
+    /**
+     * A message with the fin bit set will be sent as the last message of its
+     * sequence. A message with the fin bit cleared will require subsequent
+     * frames of opcode continuation until one of them has the fin bit set.
+     *
+     * The remote end likely will not deliver any bytes until the frame with the fin
+     * bit set has been received.
+     *
+     * @return Whether or not the fin bit is set
+     */
+    bool get_fin() const {
+        return m_fin;
+    }
+
+    /// Set the fin bit
+    /**
+     * @see get_fin for a more detailed explaination of the fin bit
+     *
+     * @param value The value to set the fin bit to.
+     */
+    void set_fin(bool value) {
+        m_fin = value;
+    }
+
+    /// Return the message opcode
+    frame::opcode::value get_opcode() const {
+        return m_opcode;
+    }
+
+    /// Set the opcode
+    void set_opcode(frame::opcode::value op) {
+        m_opcode = op;
+    }
+
+    /// Return the prepared frame header
+    /**
+     * This value is typically set by a websocket protocol processor
+     * and shouldn't be tampered with.
+     */
+    std::string const & get_header() const {
+        return m_header;
+    }
+
+    /// Set prepared frame header
+    /**
+     * Under normal circumstances this should not be called by end users
+     *
+     * @param header A string to set the header to.
+     */
+    void set_header(std::string const & header) {
+        m_header = header;
+    }
+
+    std::string const & get_extension_data() const {
+        return m_extension_data;
+    }
+
+    /// Get a reference to the payload string
+    /**
+     * @return A const reference to the message's payload string
+     */
+    std::string const & get_payload() const {
+        return m_payload;
+    }
+
+    /// Get a non-const reference to the payload string
+    /**
+     * @return A reference to the message's payload string
+     */
+    std::string & get_raw_payload() {
+        return m_payload;
+    }
+
+    /// Set payload data
+    /**
+     * Set the message buffer's payload to the given value.
+     *
+     * @param payload A string to set the payload to.
+     */
+    void set_payload(std::string const & payload) {
+        m_payload = payload;
+    }
+
+    /// Set payload data
+    /**
+     * Set the message buffer's payload to the given value.
+     *
+     * @param payload A pointer to a data array to set to.
+     * @param len The length of new payload in bytes.
+     */
+    void set_payload(void const * payload, size_t len) {
+        m_payload.reserve(len);
+        char const * pl = static_cast<char const *>(payload);
+        m_payload.assign(pl, pl + len);
+    }
+
+    /// Append payload data
+    /**
+     * Append data to the message buffer's payload.
+     *
+     * @param payload A string containing the data array to append.
+     */
+    void append_payload(std::string const & payload) {
+        m_payload.append(payload);
+    }
+
+    /// Append payload data
+    /**
+     * Append data to the message buffer's payload.
+     *
+     * @param payload A pointer to a data array to append
+     * @param len The length of payload in bytes
+     */
+    void append_payload(void const * payload, size_t len) {
+        m_payload.reserve(m_payload.size()+len);
+        m_payload.append(static_cast<char const *>(payload),len);
+    }
+
+    /// Recycle the message
+    /**
+     * A request to recycle this message was received. Forward that request to
+     * the connection message manager for processing. Errors and exceptions
+     * from the manager's recycle member function should be passed back up the
+     * call chain. The caller to message::recycle will deal with them.
+     *
+     * Recycle must *only* be called by the message shared_ptr's destructor.
+     * Once recycled successfully, ownership of the memory has been passed to
+     * another system and must not be accessed again.
+     *
+     * @return true if the message was successfully recycled, false otherwise.
+     */
+    bool recycle() {
+        con_msg_man_ptr shared = m_manager.lock();
+
+        if (shared) {
+            return shared->recycle(this);
+        } else {
+            return false;
+        }
+    }
+private:
+    con_msg_man_weak_ptr        m_manager;
+    std::string                 m_header;
+    std::string                 m_extension_data;
+    std::string                 m_payload;
+    frame::opcode::value        m_opcode;
+    bool                        m_prepared;
+    bool                        m_fin;
+    bool                        m_terminal;
+    bool                        m_compressed;
+};
+
+} // namespace message_buffer
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_MESSAGE_BUFFER_MESSAGE_HPP
diff --git a/vendor/websocketpp/websocketpp/message_buffer/pool.hpp b/vendor/websocketpp/websocketpp/message_buffer/pool.hpp
new file mode 100644
index 0000000..3af9e02
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/message_buffer/pool.hpp
@@ -0,0 +1,229 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
+#define WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
+
+#include <websocketpp/common/memory.hpp>
+
+#include <string>
+
+namespace websocketpp {
+namespace message_buffer {
+
+/* # message:
+ * object that stores a message while it is being sent or received. Contains
+ * the message payload itself, the message header, the extension data, and the
+ * opcode.
+ *
+ * # connection_message_manager:
+ * An object that manages all of the message_buffers associated with a given
+ * connection. Implements the get_message_buffer(size) method that returns
+ * a message buffer at least size bytes long.
+ *
+ * Message buffers are reference counted with shared ownership semantics. Once
+ * requested from the manager the requester and it's associated downstream code
+ * may keep a pointer to the message indefinitely at a cost of extra resource
+ * usage. Once the reference count drops to the point where the manager is the
+ * only reference the messages is recycled using whatever method is implemented
+ * in the manager.
+ *
+ * # endpoint_message_manager:
+ * An object that manages connection_message_managers. Implements the
+ * get_message_manager() method. This is used once by each connection to
+ * request the message manager that they are supposed to use to manage message
+ * buffers for their own use.
+ *
+ * TYPES OF CONNECTION_MESSAGE_MANAGERS
+ * - allocate a message with the exact size every time one is requested
+ * - maintain a pool of pre-allocated messages and return one when needed.
+ *   Recycle previously used messages back into the pool
+ *
+ * TYPES OF ENDPOINT_MESSAGE_MANAGERS
+ *  - allocate a new connection manager for each connection. Message pools
+ *    become connection specific. This increases memory usage but improves
+ *    concurrency.
+ *  - allocate a single connection manager and share a pointer to it with all
+ *    connections created by this endpoint. The message pool will be shared
+ *    among all connections, improving memory usage and performance at the cost
+ *    of reduced concurrency
+ */
+
+/// Custom deleter for use in shared_ptrs to message.
+/**
+ * This is used to catch messages about to be deleted and offer the manager the
+ * ability to recycle them instead. Message::recycle will return true if it was
+ * successfully recycled and false otherwise. In the case of exceptions or error
+ * this deleter frees the memory.
+ */
+template <typename T>
+void message_deleter(T* msg) {
+    try {
+        if (!msg->recycle()) {
+            delete msg;
+        }
+    } catch (...) {
+        // TODO: is there a better way to ensure this function doesn't throw?
+        delete msg;
+    }
+}
+
+/// Represents a buffer for a single WebSocket message.
+/**
+ *
+ *
+ */
+template <typename con_msg_manager>
+class message {
+public:
+    typedef lib::shared_ptr<message> ptr;
+
+    typedef typename con_msg_manager::weak_ptr con_msg_man_ptr;
+
+    message(con_msg_man_ptr manager, size_t size = 128)
+      : m_manager(manager)
+      , m_payload(size) {}
+
+    frame::opcode::value get_opcode() const {
+        return m_opcode;
+    }
+    const std::string& get_header() const {
+        return m_header;
+    }
+    const std::string& get_extension_data() const {
+        return m_extension_data;
+    }
+    const std::string& get_payload() const {
+        return m_payload;
+    }
+
+    /// Recycle the message
+    /**
+     * A request to recycle this message was received. Forward that request to
+     * the connection message manager for processing. Errors and exceptions
+     * from the manager's recycle member function should be passed back up the
+     * call chain. The caller to message::recycle will deal with them.
+     *
+     * Recycle must *only* be called by the message shared_ptr's destructor.
+     * Once recycled successfully, ownership of the memory has been passed to
+     * another system and must not be accessed again.
+     *
+     * @return true if the message was successfully recycled, false otherwise.
+     */
+    bool recycle() {
+        typename con_msg_manager::ptr shared = m_manager.lock();
+
+        if (shared) {
+            return shared->(recycle(this));
+        } else {
+            return false;
+        }
+    }
+private:
+    con_msg_man_ptr             m_manager;
+
+    frame::opcode::value        m_opcode;
+    std::string                 m_header;
+    std::string                 m_extension_data;
+    std::string                 m_payload;
+};
+
+namespace alloc {
+
+/// A connection message manager that allocates a new message for each
+/// request.
+template <typename message>
+class con_msg_manager {
+public:
+    typedef lib::shared_ptr<con_msg_manager> ptr;
+    typedef lib::weak_ptr<con_msg_manager> weak_ptr;
+
+    typedef typename message::ptr message_ptr;
+
+    /// Get a message buffer with specified size
+    /**
+     * @param size Minimum size in bytes to request for the message payload.
+     *
+     * @return A shared pointer to a new message with specified size.
+     */
+    message_ptr get_message(size_t size) const {
+        return lib::make_shared<message>(size);
+    }
+
+    /// Recycle a message
+    /**
+     * This method shouldn't be called. If it is, return false to indicate an
+     * error. The rest of the method recycle chain should notice this and free
+     * the memory.
+     *
+     * @param msg The message to be recycled.
+     *
+     * @return true if the message was successfully recycled, false otherwse.
+     */
+    bool recycle(message * msg) {
+        return false;
+    }
+};
+
+/// An endpoint message manager that allocates a new manager for each
+/// connection.
+template <typename con_msg_manager>
+class endpoint_msg_manager {
+public:
+    typedef typename con_msg_manager::ptr con_msg_man_ptr;
+
+    /// Get a pointer to a connection message manager
+    /**
+     * @return A pointer to the requested connection message manager.
+     */
+    con_msg_man_ptr get_manager() const {
+        return lib::make_shared<con_msg_manager>();
+    }
+};
+
+} // namespace alloc
+
+namespace pool {
+
+/// A connection messages manager that maintains a pool of messages that is
+/// used to fulfill get_message requests.
+class con_msg_manager {
+
+};
+
+/// An endpoint manager that maintains a shared pool of connection managers
+/// and returns an appropriate one for the requesting connection.
+class endpoint_msg_manager {
+
+};
+
+} // namespace pool
+
+} // namespace message_buffer
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_MESSAGE_BUFFER_ALLOC_HPP
diff --git a/vendor/websocketpp/websocketpp/processors/base.hpp b/vendor/websocketpp/websocketpp/processors/base.hpp
new file mode 100644
index 0000000..ddb8b81
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/processors/base.hpp
@@ -0,0 +1,299 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_PROCESSOR_BASE_HPP
+#define WEBSOCKETPP_PROCESSOR_BASE_HPP
+
+#include <websocketpp/close.hpp>
+#include <websocketpp/utilities.hpp>
+#include <websocketpp/uri.hpp>
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/system_error.hpp>
+
+#include <string>
+
+namespace websocketpp {
+namespace processor {
+
+/// Constants related to processing WebSocket connections
+namespace constants {
+
+static char const upgrade_token[] = "websocket";
+static char const connection_token[] = "upgrade";
+static char const handshake_guid[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+
+} // namespace constants
+
+
+/// Processor class related error codes
+namespace error_cat {
+enum value {
+    BAD_REQUEST = 0, // Error was the result of improperly formatted user input
+    INTERNAL_ERROR = 1, // Error was a logic error internal to WebSocket++
+    PROTOCOL_VIOLATION = 2,
+    MESSAGE_TOO_BIG = 3,
+    PAYLOAD_VIOLATION = 4 // Error was due to receiving invalid payload data
+};
+} // namespace error_cat
+
+/// Error code category and codes used by all processor types
+namespace error {
+enum processor_errors {
+    /// Catch-all error for processor policy errors that don't fit in other
+    /// categories
+    general = 1,
+
+    /// Error was the result of improperly formatted user input
+    bad_request,
+
+    /// Processor encountered a protocol violation in an incoming message
+    protocol_violation,
+
+    /// Processor encountered a message that was too large
+    message_too_big,
+
+    /// Processor encountered invalid payload data.
+    invalid_payload,
+
+    /// The processor method was called with invalid arguments
+    invalid_arguments,
+
+    /// Opcode was invalid for requested operation
+    invalid_opcode,
+
+    /// Control frame too large
+    control_too_big,
+
+    /// Illegal use of reserved bit
+    invalid_rsv_bit,
+
+    /// Fragmented control message
+    fragmented_control,
+
+    /// Continuation without message
+    invalid_continuation,
+
+    /// Clients may not send unmasked frames
+    masking_required,
+
+    /// Servers may not send masked frames
+    masking_forbidden,
+
+    /// Payload length not minimally encoded
+    non_minimal_encoding,
+
+    /// Not supported on 32 bit systems
+    requires_64bit,
+
+    /// Invalid UTF-8 encoding
+    invalid_utf8,
+
+    /// Operation required not implemented functionality
+    not_implemented,
+
+    /// Invalid HTTP method
+    invalid_http_method,
+
+    /// Invalid HTTP version
+    invalid_http_version,
+
+    /// Invalid HTTP status
+    invalid_http_status,
+
+    /// Missing Required Header
+    missing_required_header,
+
+    /// Embedded SHA-1 library error
+    sha1_library,
+
+    /// No support for this feature in this protocol version.
+    no_protocol_support,
+
+    /// Reserved close code used
+    reserved_close_code,
+
+    /// Invalid close code used
+    invalid_close_code,
+
+    /// Using a reason requires a close code
+    reason_requires_code,
+
+    /// Error parsing subprotocols
+    subprotocol_parse_error,
+
+    /// Error parsing extensions
+    extension_parse_error,
+
+    /// Extension related operation was ignored because extensions are disabled
+    extensions_disabled,
+    
+    /// Short Ke3 read. Hybi00 requires a third key to be read from the 8 bytes
+    /// after the handshake. Less than 8 bytes were read.
+    short_key3
+};
+
+/// Category for processor errors
+class processor_category : public lib::error_category {
+public:
+    processor_category() {}
+
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.processor";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case error::general:
+                return "Generic processor error";
+            case error::bad_request:
+                return "invalid user input";
+            case error::protocol_violation:
+                return "Generic protocol violation";
+            case error::message_too_big:
+                return "A message was too large";
+            case error::invalid_payload:
+                return "A payload contained invalid data";
+            case error::invalid_arguments:
+                return "invalid function arguments";
+            case error::invalid_opcode:
+                return "invalid opcode";
+            case error::control_too_big:
+                return "Control messages are limited to fewer than 125 characters";
+            case error::invalid_rsv_bit:
+                return "Invalid use of reserved bits";
+            case error::fragmented_control:
+                return "Control messages cannot be fragmented";
+            case error::invalid_continuation:
+                return "Invalid message continuation";
+            case error::masking_required:
+                return "Clients may not send unmasked frames";
+            case error::masking_forbidden:
+                return "Servers may not send masked frames";
+            case error::non_minimal_encoding:
+                return "Payload length was not minimally encoded";
+            case error::requires_64bit:
+                return "64 bit frames are not supported on 32 bit systems";
+            case error::invalid_utf8:
+                return "Invalid UTF8 encoding";
+            case error::not_implemented:
+                return "Operation required not implemented functionality";
+            case error::invalid_http_method:
+                return "Invalid HTTP method.";
+            case error::invalid_http_version:
+                return "Invalid HTTP version.";
+            case error::invalid_http_status:
+                return "Invalid HTTP status.";
+            case error::missing_required_header:
+                return "A required HTTP header is missing";
+            case error::sha1_library:
+                return "SHA-1 library error";
+            case error::no_protocol_support:
+                return "The WebSocket protocol version in use does not support this feature";
+            case error::reserved_close_code:
+                return "Reserved close code used";
+            case error::invalid_close_code:
+                return "Invalid close code used";
+            case error::reason_requires_code:
+                return "Using a close reason requires a valid close code";
+            case error::subprotocol_parse_error:
+                return "Error parsing subprotocol header";
+            case error::extension_parse_error:
+                return "Error parsing extension header";
+            case error::extensions_disabled:
+                return "Extensions are disabled";
+            case error::short_key3:
+                return "Short Hybi00 Key 3 read";
+            default:
+                return "Unknown";
+        }
+    }
+};
+
+/// Get a reference to a static copy of the processor error category
+inline lib::error_category const & get_processor_category() {
+    static processor_category instance;
+    return instance;
+}
+
+/// Create an error code with the given value and the processor category
+inline lib::error_code make_error_code(error::processor_errors e) {
+    return lib::error_code(static_cast<int>(e), get_processor_category());
+}
+
+/// Converts a processor error_code into a websocket close code
+/**
+ * Looks up the appropriate WebSocket close code that should be sent after an
+ * error of this sort occurred.
+ *
+ * If the error is not in the processor category close::status::blank is
+ * returned.
+ *
+ * If the error isn't normally associated with reasons to close a connection
+ * (such as errors intended to be used internally or delivered to client
+ * applications, ex: invalid arguments) then
+ * close::status::internal_endpoint_error is returned.
+ */
+inline close::status::value to_ws(lib::error_code ec) {
+    if (ec.category() != get_processor_category()) {
+        return close::status::blank;
+    }
+
+    switch (ec.value()) {
+        case error::protocol_violation:
+        case error::control_too_big:
+        case error::invalid_opcode:
+        case error::invalid_rsv_bit:
+        case error::fragmented_control:
+        case error::invalid_continuation:
+        case error::masking_required:
+        case error::masking_forbidden:
+        case error::reserved_close_code:
+        case error::invalid_close_code:
+            return close::status::protocol_error;
+        case error::invalid_payload:
+        case error::invalid_utf8:
+            return close::status::invalid_payload;
+        case error::message_too_big:
+            return close::status::message_too_big;
+        default:
+            return close::status::internal_endpoint_error;
+    }
+}
+
+} // namespace error
+} // namespace processor
+} // namespace websocketpp
+
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum<websocketpp::processor::error::processor_errors>
+{
+    static bool const value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+
+#endif //WEBSOCKETPP_PROCESSOR_BASE_HPP
diff --git a/vendor/websocketpp/websocketpp/processors/hybi00.hpp b/vendor/websocketpp/websocketpp/processors/hybi00.hpp
new file mode 100644
index 0000000..95ad9df
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/processors/hybi00.hpp
@@ -0,0 +1,462 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_PROCESSOR_HYBI00_HPP
+#define WEBSOCKETPP_PROCESSOR_HYBI00_HPP
+
+#include <websocketpp/frame.hpp>
+#include <websocketpp/http/constants.hpp>
+
+#include <websocketpp/utf8_validator.hpp>
+#include <websocketpp/common/network.hpp>
+#include <websocketpp/common/md5.hpp>
+#include <websocketpp/common/platforms.hpp>
+
+#include <websocketpp/processors/processor.hpp>
+
+#include <algorithm>
+#include <cstdlib>
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace processor {
+
+/// Processor for Hybi Draft version 00
+/**
+ * There are many differences between Hybi 00 and Hybi 13
+ */
+template <typename config>
+class hybi00 : public processor<config> {
+public:
+    typedef processor<config> base;
+
+    typedef typename config::request_type request_type;
+    typedef typename config::response_type response_type;
+
+    typedef typename config::message_type message_type;
+    typedef typename message_type::ptr message_ptr;
+
+    typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
+
+    explicit hybi00(bool secure, bool p_is_server, msg_manager_ptr manager)
+      : processor<config>(secure, p_is_server)
+      , msg_hdr(0x00)
+      , msg_ftr(0xff)
+      , m_state(HEADER)
+      , m_msg_manager(manager) {}
+
+    int get_version() const {
+        return 0;
+    }
+
+    lib::error_code validate_handshake(request_type const & r) const {
+        if (r.get_method() != "GET") {
+            return make_error_code(error::invalid_http_method);
+        }
+
+        if (r.get_version() != "HTTP/1.1") {
+            return make_error_code(error::invalid_http_version);
+        }
+
+        // required headers
+        // Host is required by HTTP/1.1
+        // Connection is required by is_websocket_handshake
+        // Upgrade is required by is_websocket_handshake
+        if (r.get_header("Sec-WebSocket-Key1").empty() ||
+            r.get_header("Sec-WebSocket-Key2").empty() ||
+            r.get_header("Sec-WebSocket-Key3").empty())
+        {
+            return make_error_code(error::missing_required_header);
+        }
+
+        return lib::error_code();
+    }
+
+    lib::error_code process_handshake(request_type const & req,
+        std::string const & subprotocol, response_type & res) const
+    {
+        char key_final[16];
+
+        // copy key1 into final key
+        decode_client_key(req.get_header("Sec-WebSocket-Key1"), &key_final[0]);
+
+        // copy key2 into final key
+        decode_client_key(req.get_header("Sec-WebSocket-Key2"), &key_final[4]);
+
+        // copy key3 into final key
+        // key3 should be exactly 8 bytes. If it is more it will be truncated
+        // if it is less the final key will almost certainly be wrong.
+        // TODO: decide if it is best to silently fail here or produce some sort
+        //       of warning or exception.
+        std::string const & key3 = req.get_header("Sec-WebSocket-Key3");
+        std::copy(key3.c_str(),
+                  key3.c_str()+(std::min)(static_cast<size_t>(8), key3.size()),
+                  &key_final[8]);
+
+        res.append_header(
+            "Sec-WebSocket-Key3",
+            md5::md5_hash_string(std::string(key_final,16))
+        );
+
+        res.append_header("Upgrade","WebSocket");
+        res.append_header("Connection","Upgrade");
+
+        // Echo back client's origin unless our local application set a
+        // more restrictive one.
+        if (res.get_header("Sec-WebSocket-Origin").empty()) {
+            res.append_header("Sec-WebSocket-Origin",req.get_header("Origin"));
+        }
+
+        // Echo back the client's request host unless our local application
+        // set a different one.
+        if (res.get_header("Sec-WebSocket-Location").empty()) {
+            uri_ptr uri = get_uri(req);
+            res.append_header("Sec-WebSocket-Location",uri->str());
+        }
+
+        if (!subprotocol.empty()) {
+            res.replace_header("Sec-WebSocket-Protocol",subprotocol);
+        }
+
+        return lib::error_code();
+    }
+
+    /// Fill in a set of request headers for a client connection request
+    /**
+     * The Hybi 00 processor only implements incoming connections so this will
+     * always return an error.
+     *
+     * @param [out] req  Set of headers to fill in
+     * @param [in] uri The uri being connected to
+     * @param [in] subprotocols The list of subprotocols to request
+     */
+    lib::error_code client_handshake_request(request_type &, uri_ptr,
+        std::vector<std::string> const &) const
+    {
+        return error::make_error_code(error::no_protocol_support);
+    }
+
+    /// Validate the server's response to an outgoing handshake request
+    /**
+     * The Hybi 00 processor only implements incoming connections so this will
+     * always return an error.
+     *
+     * @param req The original request sent
+     * @param res The reponse to generate
+     * @return An error code, 0 on success, non-zero for other errors
+     */
+    lib::error_code validate_server_handshake_response(request_type const &,
+        response_type &) const
+    {
+        return error::make_error_code(error::no_protocol_support);
+    }
+
+    std::string get_raw(response_type const & res) const {
+        response_type temp = res;
+        temp.remove_header("Sec-WebSocket-Key3");
+        return temp.raw() + res.get_header("Sec-WebSocket-Key3");
+    }
+
+    std::string const & get_origin(request_type const & r) const {
+        return r.get_header("Origin");
+    }
+
+    /// Extracts requested subprotocols from a handshake request
+    /**
+     * hybi00 does support subprotocols
+     * https://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-00#section-1.9
+     *
+     * @param [in] req The request to extract from
+     * @param [out] subprotocol_list A reference to a vector of strings to store
+     * the results in.
+     */
+    lib::error_code extract_subprotocols(request_type const & req,
+        std::vector<std::string> & subprotocol_list)
+    {
+        if (!req.get_header("Sec-WebSocket-Protocol").empty()) {
+            http::parameter_list p;
+
+             if (!req.get_header_as_plist("Sec-WebSocket-Protocol",p)) {
+                 http::parameter_list::const_iterator it;
+
+                 for (it = p.begin(); it != p.end(); ++it) {
+                     subprotocol_list.push_back(it->first);
+                 }
+             } else {
+                 return error::make_error_code(error::subprotocol_parse_error);
+             }
+        }
+        return lib::error_code();
+    }
+
+    uri_ptr get_uri(request_type const & request) const {
+        std::string h = request.get_header("Host");
+
+        size_t last_colon = h.rfind(":");
+        size_t last_sbrace = h.rfind("]");
+
+        // no : = hostname with no port
+        // last : before ] = ipv6 literal with no port
+        // : with no ] = hostname with port
+        // : after ] = ipv6 literal with port
+
+        if (last_colon == std::string::npos ||
+            (last_sbrace != std::string::npos && last_sbrace > last_colon))
+        {
+            return lib::make_shared<uri>(base::m_secure, h, request.get_uri());
+        } else {
+            return lib::make_shared<uri>(base::m_secure,
+                                   h.substr(0,last_colon),
+                                   h.substr(last_colon+1),
+                                   request.get_uri());
+        }
+
+        // TODO: check if get_uri is a full uri
+    }
+
+    /// Get hybi00 handshake key3
+    /**
+     * @todo This doesn't appear to be used anymore. It might be able to be
+     * removed
+     */
+    std::string get_key3() const {
+        return "";
+    }
+
+    /// Process new websocket connection bytes
+    size_t consume(uint8_t * buf, size_t len, lib::error_code & ec) {
+        // if in state header we are expecting a 0x00 byte, if we don't get one
+        // it is a fatal error
+        size_t p = 0; // bytes processed
+        size_t l = 0;
+
+        ec = lib::error_code();
+
+        while (p < len) {
+            if (m_state == HEADER) {
+                if (buf[p] == msg_hdr) {
+                    p++;
+                    m_msg_ptr = m_msg_manager->get_message(frame::opcode::text,1);
+
+                    if (!m_msg_ptr) {
+                        ec = make_error_code(websocketpp::error::no_incoming_buffers);
+                        m_state = FATAL_ERROR;
+                    } else {
+                        m_state = PAYLOAD;
+                    }
+                } else {
+                    ec = make_error_code(error::protocol_violation);
+                    m_state = FATAL_ERROR;
+                }
+            } else if (m_state == PAYLOAD) {
+                uint8_t *it = std::find(buf+p,buf+len,msg_ftr);
+
+                // 0    1    2    3    4    5
+                // 0x00 0x23 0x23 0x23 0xff 0xXX
+
+                // Copy payload bytes into message
+                l = static_cast<size_t>(it-(buf+p));
+                m_msg_ptr->append_payload(buf+p,l);
+                p += l;
+
+                if (it != buf+len) {
+                    // message is done, copy it and the trailing
+                    p++;
+                    // TODO: validation
+                    m_state = READY;
+                }
+            } else {
+                // TODO
+                break;
+            }
+        }
+        // If we get one, we create a new message and move to application state
+
+        // if in state application we are copying bytes into the output message
+        // and validating them for UTF8 until we hit a 0xff byte. Once we hit
+        // 0x00, the message is complete and is dispatched. Then we go back to
+        // header state.
+
+        //ec = make_error_code(error::not_implemented);
+        return p;
+    }
+
+    bool ready() const {
+        return (m_state == READY);
+    }
+
+    bool get_error() const {
+        return false;
+    }
+
+    message_ptr get_message() {
+        message_ptr ret = m_msg_ptr;
+        m_msg_ptr = message_ptr();
+        m_state = HEADER;
+        return ret;
+    }
+
+    /// Prepare a message for writing
+    /**
+     * Performs validation, masking, compression, etc. will return an error if
+     * there was an error, otherwise msg will be ready to be written
+     */
+    virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out)
+    {
+        if (!in || !out) {
+            return make_error_code(error::invalid_arguments);
+        }
+
+        // TODO: check if the message is prepared already
+
+        // validate opcode
+        if (in->get_opcode() != frame::opcode::text) {
+            return make_error_code(error::invalid_opcode);
+        }
+
+        std::string& i = in->get_raw_payload();
+        //std::string& o = out->get_raw_payload();
+
+        // validate payload utf8
+        if (!utf8_validator::validate(i)) {
+            return make_error_code(error::invalid_payload);
+        }
+
+        // generate header
+        out->set_header(std::string(reinterpret_cast<char const *>(&msg_hdr),1));
+
+        // process payload
+        out->set_payload(i);
+        out->append_payload(std::string(reinterpret_cast<char const *>(&msg_ftr),1));
+
+        // hybi00 doesn't support compression
+        // hybi00 doesn't have masking
+
+        out->set_prepared(true);
+
+        return lib::error_code();
+    }
+
+    /// Prepare a ping frame
+    /**
+     * Hybi 00 doesn't support pings so this will always return an error
+     *
+     * @param in The string to use for the ping payload
+     * @param out The message buffer to prepare the ping in.
+     * @return Status code, zero on success, non-zero on failure
+     */
+    lib::error_code prepare_ping(std::string const &, message_ptr) const
+    {
+        return lib::error_code(error::no_protocol_support);
+    }
+
+    /// Prepare a pong frame
+    /**
+     * Hybi 00 doesn't support pongs so this will always return an error
+     *
+     * @param in The string to use for the pong payload
+     * @param out The message buffer to prepare the pong in.
+     * @return Status code, zero on success, non-zero on failure
+     */
+    lib::error_code prepare_pong(std::string const &, message_ptr) const
+    {
+        return lib::error_code(error::no_protocol_support);
+    }
+
+    /// Prepare a close frame
+    /**
+     * Hybi 00 doesn't support the close code or reason so these parameters are
+     * ignored.
+     *
+     * @param code The close code to send
+     * @param reason The reason string to send
+     * @param out The message buffer to prepare the fame in
+     * @return Status code, zero on success, non-zero on failure
+     */
+    lib::error_code prepare_close(close::status::value, std::string const &, 
+        message_ptr out) const
+    {
+        if (!out) {
+            return lib::error_code(error::invalid_arguments);
+        }
+
+        std::string val;
+        val.append(1,'\xff');
+        val.append(1,'\x00');
+        out->set_payload(val);
+        out->set_prepared(true);
+
+        return lib::error_code();
+    }
+private:
+    void decode_client_key(std::string const & key, char * result) const {
+        unsigned int spaces = 0;
+        std::string digits;
+        uint32_t num;
+
+        // key2
+        for (size_t i = 0; i < key.size(); i++) {
+            if (key[i] == ' ') {
+                spaces++;
+            } else if (key[i] >= '0' && key[i] <= '9') {
+                digits += key[i];
+            }
+        }
+
+        num = static_cast<uint32_t>(strtoul(digits.c_str(), NULL, 10));
+        if (spaces > 0 && num > 0) {
+            num = htonl(num/spaces);
+            std::copy(reinterpret_cast<char*>(&num),
+                      reinterpret_cast<char*>(&num)+4,
+                      result);
+        } else {
+            std::fill(result,result+4,0);
+        }
+    }
+
+    enum state {
+        HEADER = 0,
+        PAYLOAD = 1,
+        READY = 2,
+        FATAL_ERROR = 3
+    };
+
+    uint8_t const msg_hdr;
+    uint8_t const msg_ftr;
+
+    state m_state;
+
+    msg_manager_ptr m_msg_manager;
+    message_ptr m_msg_ptr;
+    utf8_validator::validator m_validator;
+};
+
+} // namespace processor
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_PROCESSOR_HYBI00_HPP
diff --git a/vendor/websocketpp/websocketpp/processors/hybi07.hpp b/vendor/websocketpp/websocketpp/processors/hybi07.hpp
new file mode 100644
index 0000000..14b67c2
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/processors/hybi07.hpp
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_PROCESSOR_HYBI07_HPP
+#define WEBSOCKETPP_PROCESSOR_HYBI07_HPP
+
+#include <websocketpp/processors/hybi08.hpp>
+
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace processor {
+
+/// Processor for Hybi Draft version 07
+/**
+ * The primary difference between 07 and 08 is a version number.
+ */
+template <typename config>
+class hybi07 : public hybi08<config> {
+public:
+    typedef typename config::request_type request_type;
+
+    typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
+    typedef typename config::rng_type rng_type;
+
+    explicit hybi07(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
+      : hybi08<config>(secure, p_is_server, manager, rng) {}
+
+    /// Fill in a set of request headers for a client connection request
+    /**
+     * The Hybi 07 processor only implements incoming connections so this will
+     * always return an error.
+     *
+     * @param [out] req  Set of headers to fill in
+     * @param [in] uri The uri being connected to
+     * @param [in] subprotocols The list of subprotocols to request
+     */
+    lib::error_code client_handshake_request(request_type &, uri_ptr,
+        std::vector<std::string> const &) const
+    {
+        return error::make_error_code(error::no_protocol_support);
+    }
+
+    int get_version() const {
+        return 7;
+    }
+private:
+};
+
+} // namespace processor
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_PROCESSOR_HYBI07_HPP
diff --git a/vendor/websocketpp/websocketpp/processors/hybi08.hpp b/vendor/websocketpp/websocketpp/processors/hybi08.hpp
new file mode 100644
index 0000000..15f6e65
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/processors/hybi08.hpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_PROCESSOR_HYBI08_HPP
+#define WEBSOCKETPP_PROCESSOR_HYBI08_HPP
+
+#include <websocketpp/processors/hybi13.hpp>
+
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace processor {
+
+/// Processor for Hybi Draft version 08
+/**
+ * The primary difference between 08 and 13 is a different origin header name
+ */
+template <typename config>
+class hybi08 : public hybi13<config> {
+public:
+    typedef hybi08<config> type;
+    typedef typename config::request_type request_type;
+
+    typedef typename config::con_msg_manager_type::ptr msg_manager_ptr;
+    typedef typename config::rng_type rng_type;
+
+    explicit hybi08(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
+      : hybi13<config>(secure, p_is_server, manager, rng) {}
+
+    /// Fill in a set of request headers for a client connection request
+    /**
+     * The Hybi 08 processor only implements incoming connections so this will
+     * always return an error.
+     *
+     * @param [out] req  Set of headers to fill in
+     * @param [in] uri The uri being connected to
+     * @param [in] subprotocols The list of subprotocols to request
+     */
+    lib::error_code client_handshake_request(request_type &, uri_ptr,
+        std::vector<std::string> const &) const
+    {
+        return error::make_error_code(error::no_protocol_support);
+    }
+
+    int get_version() const {
+        return 8;
+    }
+
+    std::string const & get_origin(request_type const & r) const {
+        return r.get_header("Sec-WebSocket-Origin");
+    }
+private:
+};
+
+} // namespace processor
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_PROCESSOR_HYBI08_HPP
diff --git a/vendor/websocketpp/websocketpp/processors/hybi13.hpp b/vendor/websocketpp/websocketpp/processors/hybi13.hpp
new file mode 100644
index 0000000..7948665
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/processors/hybi13.hpp
@@ -0,0 +1,1056 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_PROCESSOR_HYBI13_HPP
+#define WEBSOCKETPP_PROCESSOR_HYBI13_HPP
+
+#include <websocketpp/processors/processor.hpp>
+
+#include <websocketpp/frame.hpp>
+#include <websocketpp/http/constants.hpp>
+
+#include <websocketpp/utf8_validator.hpp>
+#include <websocketpp/sha1/sha1.hpp>
+#include <websocketpp/base64/base64.hpp>
+
+#include <websocketpp/common/network.hpp>
+#include <websocketpp/common/platforms.hpp>
+
+#include <algorithm>
+#include <cassert>
+#include <string>
+#include <vector>
+#include <utility>
+
+namespace websocketpp {
+namespace processor {
+
+/// Processor for Hybi version 13 (RFC6455)
+template <typename config>
+class hybi13 : public processor<config> {
+public:
+    typedef processor<config> base;
+
+    typedef typename config::request_type request_type;
+    typedef typename config::response_type response_type;
+
+    typedef typename config::message_type message_type;
+    typedef typename message_type::ptr message_ptr;
+
+    typedef typename config::con_msg_manager_type msg_manager_type;
+    typedef typename msg_manager_type::ptr msg_manager_ptr;
+    typedef typename config::rng_type rng_type;
+
+    typedef typename config::permessage_deflate_type permessage_deflate_type;
+
+    typedef std::pair<lib::error_code,std::string> err_str_pair;
+
+    explicit hybi13(bool secure, bool p_is_server, msg_manager_ptr manager, rng_type& rng)
+      : processor<config>(secure, p_is_server)
+      , m_msg_manager(manager)
+      , m_rng(rng)
+    {
+        reset_headers();
+    }
+
+    int get_version() const {
+        return 13;
+    }
+
+    bool has_permessage_deflate() const {
+        return m_permessage_deflate.is_implemented();
+    }
+
+    err_str_pair negotiate_extensions(request_type const & request) {
+        return negotiate_extensions_helper(request);
+    }
+    
+    err_str_pair negotiate_extensions(response_type const & response) {
+        return negotiate_extensions_helper(response);
+    }
+    
+    /// Extension negotiation helper function
+    /**
+     * This exists mostly because the code for requests and responses is
+     * identical and I can't have virtual template methods.
+     */
+    template <typename header_type>
+    err_str_pair negotiate_extensions_helper(header_type const & header) {
+        err_str_pair ret;
+
+        // Respect blanket disabling of all extensions and don't even parse
+        // the extension header
+        if (!config::enable_extensions) {
+            ret.first = make_error_code(error::extensions_disabled);
+            return ret;
+        }
+
+        http::parameter_list p;
+
+        bool error = header.get_header_as_plist("Sec-WebSocket-Extensions",p);
+
+        if (error) {
+            ret.first = make_error_code(error::extension_parse_error);
+            return ret;
+        }
+
+        // If there are no extensions parsed then we are done!
+        if (p.size() == 0) {
+            return ret;
+        }
+
+        http::parameter_list::const_iterator it;
+
+        if (m_permessage_deflate.is_implemented()) {
+            err_str_pair neg_ret;
+            for (it = p.begin(); it != p.end(); ++it) {
+                // look through each extension, if the key is permessage-deflate
+                if (it->first == "permessage-deflate") {
+                    // if we have already successfully negotiated this extension
+                    // then skip any other requests to negotiate the same one
+                    // with different parameters 
+                    if (m_permessage_deflate.is_enabled()) {
+                        continue;
+                    }
+                    
+                    
+                    neg_ret = m_permessage_deflate.negotiate(it->second);
+
+                    if (neg_ret.first) {
+                        // Figure out if this is an error that should halt all
+                        // extension negotiations or simply cause negotiation of
+                        // this specific extension to fail.
+                        //std::cout << "permessage-compress negotiation failed: "
+                        //          << neg_ret.first.message() << std::endl;
+                    } else {
+                        // Note: this list will need commas if WebSocket++ ever
+                        // supports more than one extension
+                        ret.second += neg_ret.second;
+                        m_permessage_deflate.init(base::m_server);
+                        continue;
+                    }
+                }
+            }
+        }
+
+        return ret;
+    }
+
+    lib::error_code validate_handshake(request_type const & r) const {
+        if (r.get_method() != "GET") {
+            return make_error_code(error::invalid_http_method);
+        }
+
+        if (r.get_version() != "HTTP/1.1") {
+            return make_error_code(error::invalid_http_version);
+        }
+
+        // required headers
+        // Host is required by HTTP/1.1
+        // Connection is required by is_websocket_handshake
+        // Upgrade is required by is_websocket_handshake
+        if (r.get_header("Sec-WebSocket-Key").empty()) {
+            return make_error_code(error::missing_required_header);
+        }
+
+        return lib::error_code();
+    }
+
+    /* TODO: the 'subprotocol' parameter may need to be expanded into a more
+     * generic struct if other user input parameters to the processed handshake
+     * are found.
+     */
+    lib::error_code process_handshake(request_type const & request, 
+        std::string const & subprotocol, response_type & response) const
+    {
+        std::string server_key = request.get_header("Sec-WebSocket-Key");
+
+        lib::error_code ec = process_handshake_key(server_key);
+
+        if (ec) {
+            return ec;
+        }
+
+        response.replace_header("Sec-WebSocket-Accept",server_key);
+        response.append_header("Upgrade",constants::upgrade_token);
+        response.append_header("Connection",constants::connection_token);
+
+        if (!subprotocol.empty()) {
+            response.replace_header("Sec-WebSocket-Protocol",subprotocol);
+        }
+
+        return lib::error_code();
+    }
+
+    /// Fill in a set of request headers for a client connection request
+    /**
+     * @param [out] req  Set of headers to fill in
+     * @param [in] uri The uri being connected to
+     * @param [in] subprotocols The list of subprotocols to request
+     */
+    lib::error_code client_handshake_request(request_type & req, uri_ptr
+        uri, std::vector<std::string> const & subprotocols) const
+    {
+        req.set_method("GET");
+        req.set_uri(uri->get_resource());
+        req.set_version("HTTP/1.1");
+
+        req.append_header("Upgrade","websocket");
+        req.append_header("Connection","Upgrade");
+        req.replace_header("Sec-WebSocket-Version","13");
+        req.replace_header("Host",uri->get_host_port());
+
+        if (!subprotocols.empty()) {
+            std::ostringstream result;
+            std::vector<std::string>::const_iterator it = subprotocols.begin();
+            result << *it++;
+            while (it != subprotocols.end()) {
+                result << ", " << *it++;
+            }
+
+            req.replace_header("Sec-WebSocket-Protocol",result.str());
+        }
+
+        // Generate handshake key
+        frame::uint32_converter conv;
+        unsigned char raw_key[16];
+
+        for (int i = 0; i < 4; i++) {
+            conv.i = m_rng();
+            std::copy(conv.c,conv.c+4,&raw_key[i*4]);
+        }
+
+        req.replace_header("Sec-WebSocket-Key",base64_encode(raw_key, 16));
+
+        if (m_permessage_deflate.is_implemented()) {
+            std::string offer = m_permessage_deflate.generate_offer();
+            if (!offer.empty()) {
+                req.replace_header("Sec-WebSocket-Extensions",offer);
+            }
+        }
+
+        return lib::error_code();
+    }
+
+    /// Validate the server's response to an outgoing handshake request
+    /**
+     * @param req The original request sent
+     * @param res The reponse to generate
+     * @return An error code, 0 on success, non-zero for other errors
+     */
+    lib::error_code validate_server_handshake_response(request_type const & req,
+        response_type& res) const
+    {
+        // A valid response has an HTTP 101 switching protocols code
+        if (res.get_status_code() != http::status_code::switching_protocols) {
+            return error::make_error_code(error::invalid_http_status);
+        }
+
+        // And the upgrade token in an upgrade header
+        std::string const & upgrade_header = res.get_header("Upgrade");
+        if (utility::ci_find_substr(upgrade_header, constants::upgrade_token,
+            sizeof(constants::upgrade_token)-1) == upgrade_header.end())
+        {
+            return error::make_error_code(error::missing_required_header);
+        }
+
+        // And the websocket token in the connection header
+        std::string const & con_header = res.get_header("Connection");
+        if (utility::ci_find_substr(con_header, constants::connection_token,
+            sizeof(constants::connection_token)-1) == con_header.end())
+        {
+            return error::make_error_code(error::missing_required_header);
+        }
+
+        // And has a valid Sec-WebSocket-Accept value
+        std::string key = req.get_header("Sec-WebSocket-Key");
+        lib::error_code ec = process_handshake_key(key);
+
+        if (ec || key != res.get_header("Sec-WebSocket-Accept")) {
+            return error::make_error_code(error::missing_required_header);
+        }
+
+        // check extensions
+
+        return lib::error_code();
+    }
+
+    std::string get_raw(response_type const & res) const {
+        return res.raw();
+    }
+
+    std::string const & get_origin(request_type const & r) const {
+        return r.get_header("Origin");
+    }
+
+    lib::error_code extract_subprotocols(request_type const & req,
+        std::vector<std::string> & subprotocol_list)
+    {
+        if (!req.get_header("Sec-WebSocket-Protocol").empty()) {
+            http::parameter_list p;
+
+             if (!req.get_header_as_plist("Sec-WebSocket-Protocol",p)) {
+                 http::parameter_list::const_iterator it;
+
+                 for (it = p.begin(); it != p.end(); ++it) {
+                     subprotocol_list.push_back(it->first);
+                 }
+             } else {
+                 return error::make_error_code(error::subprotocol_parse_error);
+             }
+        }
+        return lib::error_code();
+    }
+
+    uri_ptr get_uri(request_type const & request) const {
+        return get_uri_from_host(request,(base::m_secure ? "wss" : "ws"));
+    }
+
+    /// Process new websocket connection bytes
+    /**
+     *
+     * Hybi 13 data streams represent a series of variable length frames. Each
+     * frame is made up of a series of fixed length fields. The lengths of later
+     * fields are contained in earlier fields. The first field length is fixed
+     * by the spec.
+     *
+     * This processor represents a state machine that keeps track of what field
+     * is presently being read and how many more bytes are needed to complete it
+     *
+     *
+     *
+     *
+     * Read two header bytes
+     *   Extract full frame length.
+     *   Read extra header bytes
+     * Validate frame header (including extension validate)
+     * Read extension data into extension message state object
+     * Read payload data into payload
+     *
+     * @param buf Input buffer
+     *
+     * @param len Length of input buffer
+     *
+     * @return Number of bytes processed or zero on error
+     */
+    size_t consume(uint8_t * buf, size_t len, lib::error_code & ec) {
+        size_t p = 0;
+
+        ec = lib::error_code();
+
+        //std::cout << "consume: " << utility::to_hex(buf,len) << std::endl;
+
+        // Loop while we don't have a message ready and we still have bytes
+        // left to process.
+        while (m_state != READY && m_state != FATAL_ERROR &&
+               (p < len || m_bytes_needed == 0))
+        {
+            if (m_state == HEADER_BASIC) {
+                p += this->copy_basic_header_bytes(buf+p,len-p);
+
+                if (m_bytes_needed > 0) {
+                    continue;
+                }
+
+                ec = this->validate_incoming_basic_header(
+                    m_basic_header, base::m_server, !m_data_msg.msg_ptr
+                );
+                if (ec) {break;}
+
+                // extract full header size and adjust consume state accordingly
+                m_state = HEADER_EXTENDED;
+                m_cursor = 0;
+                m_bytes_needed = frame::get_header_len(m_basic_header) -
+                    frame::BASIC_HEADER_LENGTH;
+            } else if (m_state == HEADER_EXTENDED) {
+                p += this->copy_extended_header_bytes(buf+p,len-p);
+
+                if (m_bytes_needed > 0) {
+                    continue;
+                }
+
+                ec = validate_incoming_extended_header(m_basic_header,m_extended_header);
+                if (ec){break;}
+
+                m_state = APPLICATION;
+                m_bytes_needed = static_cast<size_t>(get_payload_size(m_basic_header,m_extended_header));
+
+                // check if this frame is the start of a new message and set up
+                // the appropriate message metadata.
+                frame::opcode::value op = frame::get_opcode(m_basic_header);
+
+                // TODO: get_message failure conditions
+
+                if (frame::opcode::is_control(op)) {
+                    m_control_msg = msg_metadata(
+                        m_msg_manager->get_message(op,m_bytes_needed),
+                        frame::get_masking_key(m_basic_header,m_extended_header)
+                    );
+
+                    m_current_msg = &m_control_msg;
+                } else {
+                    if (!m_data_msg.msg_ptr) {
+                        if (m_bytes_needed > base::m_max_message_size) {
+                            ec = make_error_code(error::message_too_big);
+                            break;
+                        }
+                        
+                        m_data_msg = msg_metadata(
+                            m_msg_manager->get_message(op,m_bytes_needed),
+                            frame::get_masking_key(m_basic_header,m_extended_header)
+                        );
+                        
+                        if (m_permessage_deflate.is_enabled()) {
+                            m_data_msg.msg_ptr->set_compressed(frame::get_rsv1(m_basic_header));
+                        }
+                    } else {
+                        // Fetch the underlying payload buffer from the data message we
+                        // are writing into.
+                        std::string & out = m_data_msg.msg_ptr->get_raw_payload();
+                        
+                        if (out.size() + m_bytes_needed > base::m_max_message_size) {
+                            ec = make_error_code(error::message_too_big);
+                            break;
+                        }
+                        
+                        // Each frame starts a new masking key. All other state
+                        // remains between frames.
+                        m_data_msg.prepared_key = prepare_masking_key(
+                            frame::get_masking_key(
+                                m_basic_header,
+                                m_extended_header
+                            )
+                        );
+                        
+                        out.reserve(out.size() + m_bytes_needed);
+                    }
+                    m_current_msg = &m_data_msg;
+                }
+            } else if (m_state == EXTENSION) {
+                m_state = APPLICATION;
+            } else if (m_state == APPLICATION) {
+                size_t bytes_to_process = (std::min)(m_bytes_needed,len-p);
+
+                if (bytes_to_process > 0) {
+                    p += this->process_payload_bytes(buf+p,bytes_to_process,ec);
+
+                    if (ec) {break;}
+                }
+
+                if (m_bytes_needed > 0) {
+                    continue;
+                }
+
+                // If this was the last frame in the message set the ready flag.
+                // Otherwise, reset processor state to read additional frames.
+                if (frame::get_fin(m_basic_header)) {
+                    ec = finalize_message();
+                    if (ec) {
+                        break;
+                    }
+                } else {
+                    this->reset_headers();
+                }
+            } else {
+                // shouldn't be here
+                ec = make_error_code(error::general);
+                return 0;
+            }
+        }
+
+        return p;
+    }
+
+    /// Perform any finalization actions on an incoming message
+    /**
+     * Called after the full message is received. Provides the opportunity for
+     * extensions to complete any data post processing as well as final UTF8
+     * validation checks for text messages.
+     *
+     * @return A code indicating errors, if any
+     */
+    lib::error_code finalize_message() {
+        std::string & out = m_current_msg->msg_ptr->get_raw_payload();
+
+        // if the frame is compressed, append the compression
+        // trailer and flush the compression buffer.
+        if (m_permessage_deflate.is_enabled()
+            && m_current_msg->msg_ptr->get_compressed())
+        {
+            uint8_t trailer[4] = {0x00, 0x00, 0xff, 0xff};
+
+            // Decompress current buffer into the message buffer
+            lib::error_code ec;
+            ec = m_permessage_deflate.decompress(trailer,4,out);
+            if (ec) {
+                return ec;
+            }
+        }
+
+        // ensure that text messages end on a valid UTF8 code point
+        if (frame::get_opcode(m_basic_header) == frame::opcode::TEXT) {
+            if (!m_current_msg->validator.complete()) {
+                return make_error_code(error::invalid_utf8);
+            }
+        }
+
+        m_state = READY;
+
+        return lib::error_code();
+    }
+
+    void reset_headers() {
+        m_state = HEADER_BASIC;
+        m_bytes_needed = frame::BASIC_HEADER_LENGTH;
+
+        m_basic_header.b0 = 0x00;
+        m_basic_header.b1 = 0x00;
+
+        std::fill_n(
+            m_extended_header.bytes,
+            frame::MAX_EXTENDED_HEADER_LENGTH,
+            0x00
+        );
+    }
+
+    /// Test whether or not the processor has a message ready
+    bool ready() const {
+        return (m_state == READY);
+    }
+
+    message_ptr get_message() {
+        if (!ready()) {
+            return message_ptr();
+        }
+        message_ptr ret = m_current_msg->msg_ptr;
+        m_current_msg->msg_ptr.reset();
+
+        if (frame::opcode::is_control(ret->get_opcode())) {
+            m_control_msg.msg_ptr.reset();
+        } else {
+            m_data_msg.msg_ptr.reset();
+        }
+
+        this->reset_headers();
+
+        return ret;
+    }
+
+    /// Test whether or not the processor is in a fatal error state.
+    bool get_error() const {
+        return m_state == FATAL_ERROR;
+    }
+
+    size_t get_bytes_needed() const {
+        return m_bytes_needed;
+    }
+
+    /// Prepare a user data message for writing
+    /**
+     * Performs validation, masking, compression, etc. will return an error if
+     * there was an error, otherwise msg will be ready to be written
+     *
+     * TODO: tests
+     *
+     * @param in An unprepared message to prepare
+     * @param out A message to be overwritten with the prepared message
+     * @return error code
+     */
+    virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out)
+    {
+        if (!in || !out) {
+            return make_error_code(error::invalid_arguments);
+        }
+
+        frame::opcode::value op = in->get_opcode();
+
+        // validate opcode: only regular data frames
+        if (frame::opcode::is_control(op)) {
+            return make_error_code(error::invalid_opcode);
+        }
+
+        std::string& i = in->get_raw_payload();
+        std::string& o = out->get_raw_payload();
+
+        // validate payload utf8
+        if (op == frame::opcode::TEXT && !utf8_validator::validate(i)) {
+            return make_error_code(error::invalid_payload);
+        }
+
+        frame::masking_key_type key;
+        bool masked = !base::m_server;
+        bool compressed = m_permessage_deflate.is_enabled()
+                          && in->get_compressed();
+        bool fin = in->get_fin();
+
+        if (masked) {
+            // Generate masking key.
+            key.i = m_rng();
+        } else {
+            key.i = 0;
+        }
+
+        // prepare payload
+        if (compressed) {
+            // compress and store in o after header.
+            m_permessage_deflate.compress(i,o);
+
+            if (o.size() < 4) {
+                return make_error_code(error::general);
+            }
+
+            // Strip trailing 4 0x00 0x00 0xff 0xff bytes before writing to the
+            // wire
+            o.resize(o.size()-4);
+
+            // mask in place if necessary
+            if (masked) {
+                this->masked_copy(o,o,key);
+            }
+        } else {
+            // no compression, just copy data into the output buffer
+            o.resize(i.size());
+
+            // if we are masked, have the masking function write to the output
+            // buffer directly to avoid another copy. If not masked, copy
+            // directly without masking.
+            if (masked) {
+                this->masked_copy(i,o,key);
+            } else {
+                std::copy(i.begin(),i.end(),o.begin());
+            }
+        }
+
+        // generate header
+        frame::basic_header h(op,o.size(),fin,masked,compressed);
+
+        if (masked) {
+            frame::extended_header e(o.size(),key.i);
+            out->set_header(frame::prepare_header(h,e));
+        } else {
+            frame::extended_header e(o.size());
+            out->set_header(frame::prepare_header(h,e));
+        }
+
+        out->set_prepared(true);
+        out->set_opcode(op);
+
+        return lib::error_code();
+    }
+
+    /// Get URI
+    lib::error_code prepare_ping(std::string const & in, message_ptr out) const {
+        return this->prepare_control(frame::opcode::PING,in,out);
+    }
+
+    lib::error_code prepare_pong(std::string const & in, message_ptr out) const {
+        return this->prepare_control(frame::opcode::PONG,in,out);
+    }
+
+    virtual lib::error_code prepare_close(close::status::value code,
+        std::string const & reason, message_ptr out) const
+    {
+        if (close::status::reserved(code)) {
+            return make_error_code(error::reserved_close_code);
+        }
+
+        if (close::status::invalid(code) && code != close::status::no_status) {
+            return make_error_code(error::invalid_close_code);
+        }
+
+        if (code == close::status::no_status && reason.size() > 0) {
+            return make_error_code(error::reason_requires_code);
+        }
+
+        if (reason.size() > frame:: limits::payload_size_basic-2) {
+            return make_error_code(error::control_too_big);
+        }
+
+        std::string payload;
+
+        if (code != close::status::no_status) {
+            close::code_converter val;
+            val.i = htons(code);
+
+            payload.resize(reason.size()+2);
+
+            payload[0] = val.c[0];
+            payload[1] = val.c[1];
+
+            std::copy(reason.begin(),reason.end(),payload.begin()+2);
+        }
+
+        return this->prepare_control(frame::opcode::CLOSE,payload,out);
+    }
+protected:
+    /// Convert a client handshake key into a server response key in place
+    lib::error_code process_handshake_key(std::string & key) const {
+        key.append(constants::handshake_guid);
+
+        unsigned char message_digest[20];
+        sha1::calc(key.c_str(),key.length(),message_digest);
+        key = base64_encode(message_digest,20);
+
+        return lib::error_code();
+    }
+
+    /// Reads bytes from buf into m_basic_header
+    size_t copy_basic_header_bytes(uint8_t const * buf, size_t len) {
+        if (len == 0 || m_bytes_needed == 0) {
+            return 0;
+        }
+
+        if (len > 1) {
+            // have at least two bytes
+            if (m_bytes_needed == 2) {
+                m_basic_header.b0 = buf[0];
+                m_basic_header.b1 = buf[1];
+                m_bytes_needed -= 2;
+                return 2;
+            } else {
+                m_basic_header.b1 = buf[0];
+                m_bytes_needed--;
+                return 1;
+            }
+        } else {
+            // have exactly one byte
+            if (m_bytes_needed == 2) {
+                m_basic_header.b0 = buf[0];
+                m_bytes_needed--;
+                return 1;
+            } else {
+                m_basic_header.b1 = buf[0];
+                m_bytes_needed--;
+                return 1;
+            }
+        }
+    }
+
+    /// Reads bytes from buf into m_extended_header
+    size_t copy_extended_header_bytes(uint8_t const * buf, size_t len) {
+        size_t bytes_to_read = (std::min)(m_bytes_needed,len);
+
+        std::copy(buf,buf+bytes_to_read,m_extended_header.bytes+m_cursor);
+        m_cursor += bytes_to_read;
+        m_bytes_needed -= bytes_to_read;
+
+        return bytes_to_read;
+    }
+
+    /// Reads bytes from buf into message payload
+    /**
+     * This function performs unmasking and uncompression, validates the
+     * decoded bytes, and writes them to the appropriate message buffer.
+     *
+     * This member function will use the input buffer as stratch space for its
+     * work. The raw input bytes will not be preserved. This applies only to the
+     * bytes actually needed. At most min(m_bytes_needed,len) will be processed.
+     *
+     * @param buf Input/working buffer
+     * @param len Length of buf
+     * @return Number of bytes processed or zero in case of an error
+     */
+    size_t process_payload_bytes(uint8_t * buf, size_t len, lib::error_code& ec)
+    {
+        // unmask if masked
+        if (frame::get_masked(m_basic_header)) {
+            m_current_msg->prepared_key = frame::byte_mask_circ(
+                buf, len, m_current_msg->prepared_key);
+            // TODO: SIMD masking
+        }
+
+        std::string & out = m_current_msg->msg_ptr->get_raw_payload();
+        size_t offset = out.size();
+
+        // decompress message if needed.
+        if (m_permessage_deflate.is_enabled()
+            && m_current_msg->msg_ptr->get_compressed())
+        {
+            // Decompress current buffer into the message buffer
+            ec = m_permessage_deflate.decompress(buf,len,out);
+            if (ec) {
+                return 0;
+            }
+        } else {
+            // No compression, straight copy
+            out.append(reinterpret_cast<char *>(buf),len);
+        }
+
+        // validate unmasked, decompressed values
+        if (m_current_msg->msg_ptr->get_opcode() == frame::opcode::TEXT) {
+            if (!m_current_msg->validator.decode(out.begin()+offset,out.end())) {
+                ec = make_error_code(error::invalid_utf8);
+                return 0;
+            }
+        }
+
+        m_bytes_needed -= len;
+
+        return len;
+    }
+
+    /// Validate an incoming basic header
+    /**
+     * Validates an incoming hybi13 basic header.
+     *
+     * @param h The basic header to validate
+     * @param is_server Whether or not the endpoint that received this frame
+     * is a server.
+     * @param new_msg Whether or not this is the first frame of the message
+     * @return 0 on success or a non-zero error code on failure
+     */
+    lib::error_code validate_incoming_basic_header(frame::basic_header const & h,
+        bool is_server, bool new_msg) const
+    {
+        frame::opcode::value op = frame::get_opcode(h);
+
+        // Check control frame size limit
+        if (frame::opcode::is_control(op) &&
+            frame::get_basic_size(h) > frame::limits::payload_size_basic)
+        {
+            return make_error_code(error::control_too_big);
+        }
+
+        // Check that RSV bits are clear
+        // The only RSV bits allowed are rsv1 if the permessage_compress
+        // extension is enabled for this connection and the message is not
+        // a control message.
+        //
+        // TODO: unit tests for this
+        if (frame::get_rsv1(h) && (!m_permessage_deflate.is_enabled()
+                || frame::opcode::is_control(op)))
+        {
+            return make_error_code(error::invalid_rsv_bit);
+        }
+
+        if (frame::get_rsv2(h) || frame::get_rsv3(h)) {
+            return make_error_code(error::invalid_rsv_bit);
+        }
+
+        // Check for reserved opcodes
+        if (frame::opcode::reserved(op)) {
+            return make_error_code(error::invalid_opcode);
+        }
+
+        // Check for invalid opcodes
+        // TODO: unit tests for this?
+        if (frame::opcode::invalid(op)) {
+            return make_error_code(error::invalid_opcode);
+        }
+
+        // Check for fragmented control message
+        if (frame::opcode::is_control(op) && !frame::get_fin(h)) {
+            return make_error_code(error::fragmented_control);
+        }
+
+        // Check for continuation without an active message
+        if (new_msg && op == frame::opcode::CONTINUATION) {
+            return make_error_code(error::invalid_continuation);
+        }
+
+        // Check for new data frame when expecting continuation
+        if (!new_msg && !frame::opcode::is_control(op) &&
+            op != frame::opcode::CONTINUATION)
+        {
+            return make_error_code(error::invalid_continuation);
+        }
+
+        // Servers should reject any unmasked frames from clients.
+        // Clients should reject any masked frames from servers.
+        if (is_server && !frame::get_masked(h)) {
+            return make_error_code(error::masking_required);
+        } else if (!is_server && frame::get_masked(h)) {
+            return make_error_code(error::masking_forbidden);
+        }
+
+        return lib::error_code();
+    }
+
+    /// Validate an incoming extended header
+    /**
+     * Validates an incoming hybi13 full header.
+     *
+     * @todo unit test for the >32 bit frames on 32 bit systems case
+     *
+     * @param h The basic header to validate
+     * @param e The extended header to validate
+     * @return An error_code, non-zero values indicate why the validation
+     * failed
+     */
+    lib::error_code validate_incoming_extended_header(frame::basic_header h,
+        frame::extended_header e) const
+    {
+        uint8_t basic_size = frame::get_basic_size(h);
+        uint64_t payload_size = frame::get_payload_size(h,e);
+
+        // Check for non-minimally encoded payloads
+        if (basic_size == frame::payload_size_code_16bit &&
+            payload_size <= frame::limits::payload_size_basic)
+        {
+            return make_error_code(error::non_minimal_encoding);
+        }
+
+        if (basic_size == frame::payload_size_code_64bit &&
+            payload_size <= frame::limits::payload_size_extended)
+        {
+            return make_error_code(error::non_minimal_encoding);
+        }
+
+        // Check for >32bit frames on 32 bit systems
+        if (sizeof(size_t) == 4 && (payload_size >> 32)) {
+            return make_error_code(error::requires_64bit);
+        }
+
+        return lib::error_code();
+    }
+
+    /// Copy and mask/unmask in one operation
+    /**
+     * Reads input from one string and writes unmasked output to another.
+     *
+     * @param [in] i The input string.
+     * @param [out] o The output string.
+     * @param [in] key The masking key to use for masking/unmasking
+     */
+    void masked_copy (std::string const & i, std::string & o,
+        frame::masking_key_type key) const
+    {
+        frame::byte_mask(i.begin(),i.end(),o.begin(),key);
+        // TODO: SIMD masking
+    }
+
+    /// Generic prepare control frame with opcode and payload.
+    /**
+     * Internal control frame building method. Handles validation, masking, etc
+     *
+     * @param op The control opcode to use
+     * @param payload The payload to use
+     * @param out The message buffer to store the prepared frame in
+     * @return Status code, zero on success, non-zero on error
+     */
+    lib::error_code prepare_control(frame::opcode::value op,
+        std::string const & payload, message_ptr out) const
+    {
+        if (!out) {
+            return make_error_code(error::invalid_arguments);
+        }
+
+        if (!frame::opcode::is_control(op)) {
+            return make_error_code(error::invalid_opcode);
+        }
+
+        if (payload.size() > frame::limits::payload_size_basic) {
+            return make_error_code(error::control_too_big);
+        }
+
+        frame::masking_key_type key;
+        bool masked = !base::m_server;
+
+        frame::basic_header h(op,payload.size(),true,masked);
+
+        std::string & o = out->get_raw_payload();
+        o.resize(payload.size());
+
+        if (masked) {
+            // Generate masking key.
+            key.i = m_rng();
+
+            frame::extended_header e(payload.size(),key.i);
+            out->set_header(frame::prepare_header(h,e));
+            this->masked_copy(payload,o,key);
+        } else {
+            frame::extended_header e(payload.size());
+            out->set_header(frame::prepare_header(h,e));
+            std::copy(payload.begin(),payload.end(),o.begin());
+        }
+    
+        out->set_opcode(op);
+        out->set_prepared(true);
+
+        return lib::error_code();
+    }
+
+    enum state {
+        HEADER_BASIC = 0,
+        HEADER_EXTENDED = 1,
+        EXTENSION = 2,
+        APPLICATION = 3,
+        READY = 4,
+        FATAL_ERROR = 5
+    };
+
+    /// This data structure holds data related to processing a message, such as
+    /// the buffer it is being written to, its masking key, its UTF8 validation
+    /// state, and sometimes its compression state.
+    struct msg_metadata {
+        msg_metadata() {}
+        msg_metadata(message_ptr m, size_t p) : msg_ptr(m),prepared_key(p) {}
+        msg_metadata(message_ptr m, frame::masking_key_type p)
+          : msg_ptr(m)
+          , prepared_key(prepare_masking_key(p)) {}
+
+        message_ptr msg_ptr;        // pointer to the message data buffer
+        size_t      prepared_key;   // prepared masking key
+        utf8_validator::validator validator; // utf8 validation state
+    };
+
+    // Basic header of the frame being read
+    frame::basic_header m_basic_header;
+
+    // Pointer to a manager that can create message buffers for us.
+    msg_manager_ptr m_msg_manager;
+
+    // Number of bytes needed to complete the current operation
+    size_t m_bytes_needed;
+
+    // Number of extended header bytes read
+    size_t m_cursor;
+
+    // Metadata for the current data msg
+    msg_metadata m_data_msg;
+    // Metadata for the current control msg
+    msg_metadata m_control_msg;
+
+    // Pointer to the metadata associated with the frame being read
+    msg_metadata * m_current_msg;
+
+    // Extended header of current frame
+    frame::extended_header m_extended_header;
+
+    rng_type & m_rng;
+
+    // Overall state of the processor
+    state m_state;
+
+    // Extensions
+    permessage_deflate_type m_permessage_deflate;
+};
+
+} // namespace processor
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_PROCESSOR_HYBI13_HPP
diff --git a/vendor/websocketpp/websocketpp/processors/processor.hpp b/vendor/websocketpp/websocketpp/processors/processor.hpp
new file mode 100644
index 0000000..5131cc4
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/processors/processor.hpp
@@ -0,0 +1,407 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_PROCESSOR_HPP
+#define WEBSOCKETPP_PROCESSOR_HPP
+
+#include <websocketpp/processors/base.hpp>
+#include <websocketpp/common/system_error.hpp>
+
+#include <websocketpp/close.hpp>
+#include <websocketpp/utilities.hpp>
+#include <websocketpp/uri.hpp>
+
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+
+namespace websocketpp {
+/// Processors encapsulate the protocol rules specific to each WebSocket version
+/**
+ * The processors namespace includes a number of free functions that operate on
+ * various WebSocket related data structures and perform processing that is not
+ * related to specific versions of the protocol.
+ *
+ * It also includes the abstract interface for the protocol specific processing
+ * engines. These engines wrap all of the logic necessary for parsing and
+ * validating WebSocket handshakes and messages of specific protocol version
+ * and set of allowed extensions.
+ *
+ * An instance of a processor represents the state of a single WebSocket
+ * connection of the associated version. One processor instance is needed per
+ * logical WebSocket connection.
+ */
+namespace processor {
+
+/// Determine whether or not a generic HTTP request is a WebSocket handshake
+/**
+ * @param r The HTTP request to read.
+ *
+ * @return True if the request is a WebSocket handshake, false otherwise
+ */
+template <typename request_type>
+bool is_websocket_handshake(request_type& r) {
+    using utility::ci_find_substr;
+
+    std::string const & upgrade_header = r.get_header("Upgrade");
+
+    if (ci_find_substr(upgrade_header, constants::upgrade_token,
+        sizeof(constants::upgrade_token)-1) == upgrade_header.end())
+    {
+        return false;
+    }
+
+    std::string const & con_header = r.get_header("Connection");
+
+    if (ci_find_substr(con_header, constants::connection_token,
+        sizeof(constants::connection_token)-1) == con_header.end())
+    {
+        return false;
+    }
+
+    return true;
+}
+
+/// Extract the version from a WebSocket handshake request
+/**
+ * A blank version header indicates a spec before versions were introduced.
+ * The only such versions in shipping products are Hixie Draft 75 and Hixie
+ * Draft 76. Draft 75 is present in Chrome 4-5 and Safari 5.0.0, Draft 76 (also
+ * known as hybi 00 is present in Chrome 6-13 and Safari 5.0.1+. As
+ * differentiating between these two sets of browsers is very difficult and
+ * Safari 5.0.1+ accounts for the vast majority of cases in the wild this
+ * function assumes that all handshakes without a valid version header are
+ * Hybi 00.
+ *
+ * @param r The WebSocket handshake request to read.
+ *
+ * @return The WebSocket handshake version or -1 if there was an extraction
+ * error.
+ */
+template <typename request_type>
+int get_websocket_version(request_type& r) {
+    if (!r.ready()) {
+        return -2;
+    }
+    
+    if (r.get_header("Sec-WebSocket-Version").empty()) {
+        return 0;
+    }
+
+    int version;
+    std::istringstream ss(r.get_header("Sec-WebSocket-Version"));
+
+    if ((ss >> version).fail()) {
+        return -1;
+    }
+
+    return version;
+}
+
+/// Extract a URI ptr from the host header of the request
+/**
+ * @param request The request to extract the Host header from.
+ *
+ * @param scheme The scheme under which this request was received (ws, wss,
+ * http, https, etc)
+ *
+ * @return A uri_pointer that encodes the value of the host header.
+ */
+template <typename request_type>
+uri_ptr get_uri_from_host(request_type & request, std::string scheme) {
+    std::string h = request.get_header("Host");
+
+    size_t last_colon = h.rfind(":");
+    size_t last_sbrace = h.rfind("]");
+
+    // no : = hostname with no port
+    // last : before ] = ipv6 literal with no port
+    // : with no ] = hostname with port
+    // : after ] = ipv6 literal with port
+    if (last_colon == std::string::npos ||
+        (last_sbrace != std::string::npos && last_sbrace > last_colon))
+    {
+        return lib::make_shared<uri>(scheme, h, request.get_uri());
+    } else {
+        return lib::make_shared<uri>(scheme,
+                               h.substr(0,last_colon),
+                               h.substr(last_colon+1),
+                               request.get_uri());
+    }
+}
+
+/// WebSocket protocol processor abstract base class
+template <typename config>
+class processor {
+public:
+    typedef processor<config> type;
+    typedef typename config::request_type request_type;
+    typedef typename config::response_type response_type;
+    typedef typename config::message_type::ptr message_ptr;
+    typedef std::pair<lib::error_code,std::string> err_str_pair;
+
+    explicit processor(bool secure, bool p_is_server)
+      : m_secure(secure)
+      , m_server(p_is_server)
+      , m_max_message_size(config::max_message_size)
+    {}
+
+    virtual ~processor() {}
+
+    /// Get the protocol version of this processor
+    virtual int get_version() const = 0;
+
+    /// Get maximum message size
+    /**
+     * Get maximum message size. Maximum message size determines the point at which the
+     * processor will fail a connection with the message_too_big protocol error.
+     *
+     * The default is retrieved from the max_message_size value from the template config
+     *
+     * @since 0.3.0
+     */
+    size_t get_max_message_size() const {
+        return m_max_message_size;
+    }
+    
+    /// Set maximum message size
+    /**
+     * Set maximum message size. Maximum message size determines the point at which the
+     * processor will fail a connection with the message_too_big protocol error.
+     *
+     * The default is retrieved from the max_message_size value from the template config
+     *
+     * @since 0.3.0
+     *
+     * @param new_value The value to set as the maximum message size.
+     */
+    void set_max_message_size(size_t new_value) {
+        m_max_message_size = new_value;
+    }
+
+    /// Returns whether or not the permessage_compress extension is implemented
+    /**
+     * Compile time flag that indicates whether this processor has implemented
+     * the permessage_compress extension. By default this is false.
+     */
+    virtual bool has_permessage_compress() const {
+        return false;
+    }
+
+    /// Initializes extensions based on the Sec-WebSocket-Extensions header
+    /**
+     * Reads the Sec-WebSocket-Extensions header and determines if any of the
+     * requested extensions are supported by this processor. If they are their
+     * settings data is initialized and an extension string to send to the
+     * is returned.
+     *
+     * @param request The request or response headers to look at.
+     */
+    virtual err_str_pair negotiate_extensions(request_type const &) {
+        return err_str_pair();
+    }
+    
+    /// Initializes extensions based on the Sec-WebSocket-Extensions header
+    /**
+     * Reads the Sec-WebSocket-Extensions header and determines if any of the
+     * requested extensions were accepted by the server. If they are their
+     * settings data is initialized. If they are not a list of required
+     * extensions (if any) is returned. This list may be sent back to the server
+     * as a part of the 1010/Extension required close code.
+     *
+     * @param response The request or response headers to look at.
+     */
+    virtual err_str_pair negotiate_extensions(response_type const &) {
+        return err_str_pair();
+    }
+
+    /// validate a WebSocket handshake request for this version
+    /**
+     * @param request The WebSocket handshake request to validate.
+     * is_websocket_handshake(request) must be true and
+     * get_websocket_version(request) must equal this->get_version().
+     *
+     * @return A status code, 0 on success, non-zero for specific sorts of
+     * failure
+     */
+    virtual lib::error_code validate_handshake(request_type const & request) const = 0;
+
+    /// Calculate the appropriate response for this websocket request
+    /**
+     * @param req The request to process
+     *
+     * @param subprotocol The subprotocol in use
+     *
+     * @param res The response to store the processed response in
+     *
+     * @return An error code, 0 on success, non-zero for other errors
+     */
+    virtual lib::error_code process_handshake(request_type const & req,
+        std::string const & subprotocol, response_type& res) const = 0;
+
+    /// Fill in an HTTP request for an outgoing connection handshake
+    /**
+     * @param req The request to process.
+     *
+     * @return An error code, 0 on success, non-zero for other errors
+     */
+    virtual lib::error_code client_handshake_request(request_type & req,
+        uri_ptr uri, std::vector<std::string> const & subprotocols) const = 0;
+
+    /// Validate the server's response to an outgoing handshake request
+    /**
+     * @param req The original request sent
+     * @param res The reponse to generate
+     * @return An error code, 0 on success, non-zero for other errors
+     */
+    virtual lib::error_code validate_server_handshake_response(request_type
+        const & req, response_type & res) const = 0;
+
+    /// Given a completed response, get the raw bytes to put on the wire
+    virtual std::string get_raw(response_type const & request) const = 0;
+
+    /// Return the value of the header containing the CORS origin.
+    virtual std::string const & get_origin(request_type const & request) const = 0;
+
+    /// Extracts requested subprotocols from a handshake request
+    /**
+     * Extracts a list of all subprotocols that the client has requested in the
+     * given opening handshake request.
+     *
+     * @param [in] req The request to extract from
+     * @param [out] subprotocol_list A reference to a vector of strings to store
+     * the results in.
+     */
+    virtual lib::error_code extract_subprotocols(const request_type & req,
+        std::vector<std::string> & subprotocol_list) = 0;
+
+    /// Extracts client uri from a handshake request
+    virtual uri_ptr get_uri(request_type const & request) const = 0;
+
+    /// process new websocket connection bytes
+    /**
+     * WebSocket connections are a continous stream of bytes that must be
+     * interpreted by a protocol processor into discrete frames.
+     *
+     * @param buf Buffer from which bytes should be read.
+     * @param len Length of buffer
+     * @param ec Reference to an error code to return any errors in
+     * @return Number of bytes processed
+     */
+    virtual size_t consume(uint8_t *buf, size_t len, lib::error_code & ec) = 0;
+
+    /// Checks if there is a message ready
+    /**
+     * Checks if the most recent consume operation processed enough bytes to
+     * complete a new WebSocket message. The message can be retrieved by calling
+     * get_message() which will reset the internal state to not-ready and allow
+     * consume to read more bytes.
+     *
+     * @return Whether or not a message is ready.
+     */
+    virtual bool ready() const = 0;
+
+    /// Retrieves the most recently processed message
+    /**
+     * Retrieves a shared pointer to the recently completed message if there is
+     * one. If ready() returns true then there is a message available.
+     * Retrieving the message with get_message will reset the state of ready.
+     * As such, each new message may be retrieved only once. Calling get_message
+     * when there is no message available will result in a null pointer being
+     * returned.
+     *
+     * @return A pointer to the most recently processed message or a null shared
+     *         pointer.
+     */
+    virtual message_ptr get_message() = 0;
+
+    /// Tests whether the processor is in a fatal error state
+    virtual bool get_error() const = 0;
+
+    /// Retrieves the number of bytes presently needed by the processor
+    /// This value may be used as a hint to the transport layer as to how many
+    /// bytes to wait for before running consume again.
+    virtual size_t get_bytes_needed() const {
+        return 1;
+    }
+
+    /// Prepare a data message for writing
+    /**
+     * Performs validation, masking, compression, etc. will return an error if
+     * there was an error, otherwise msg will be ready to be written
+     */
+    virtual lib::error_code prepare_data_frame(message_ptr in, message_ptr out) = 0;
+
+    /// Prepare a ping frame
+    /**
+     * Ping preparation is entirely state free. There is no payload validation
+     * other than length. Payload need not be UTF-8.
+     *
+     * @param in The string to use for the ping payload
+     * @param out The message buffer to prepare the ping in.
+     * @return Status code, zero on success, non-zero on failure
+     */
+    virtual lib::error_code prepare_ping(std::string const & in, message_ptr out) const 
+        = 0;
+
+    /// Prepare a pong frame
+    /**
+     * Pong preparation is entirely state free. There is no payload validation
+     * other than length. Payload need not be UTF-8.
+     *
+     * @param in The string to use for the pong payload
+     * @param out The message buffer to prepare the pong in.
+     * @return Status code, zero on success, non-zero on failure
+     */
+    virtual lib::error_code prepare_pong(std::string const & in, message_ptr out) const 
+        = 0;
+
+    /// Prepare a close frame
+    /**
+     * Close preparation is entirely state free. The code and reason are both
+     * subject to validation. Reason must be valid UTF-8. Code must be a valid
+     * un-reserved WebSocket close code. Use close::status::no_status to
+     * indicate no code. If no code is supplied a reason may not be specified.
+     *
+     * @param code The close code to send
+     * @param reason The reason string to send
+     * @param out The message buffer to prepare the fame in
+     * @return Status code, zero on success, non-zero on failure
+     */
+    virtual lib::error_code prepare_close(close::status::value code,
+        std::string const & reason, message_ptr out) const = 0;
+protected:
+    bool const m_secure;
+    bool const m_server;
+    size_t m_max_message_size;
+};
+
+} // namespace processor
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_PROCESSOR_HPP
diff --git a/vendor/websocketpp/websocketpp/random/none.hpp b/vendor/websocketpp/websocketpp/random/none.hpp
new file mode 100644
index 0000000..2163e6f
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/random/none.hpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_RANDOM_NONE_HPP
+#define WEBSOCKETPP_RANDOM_NONE_HPP
+
+namespace websocketpp {
+/// Random number generation policies
+namespace random {
+/// Stub RNG policy that always returns 0
+namespace none {
+
+/// Thread safe stub "random" integer generator.
+/**
+ * This template class provides a random integer stub. The interface mimics the
+ * WebSocket++ RNG generator classes but the generater function always returns
+ * zero. This can be used to stub out the RNG for unit and performance testing.
+ *
+ * Call operator() to generate the next number
+ */
+template <typename int_type>
+class int_generator {
+    public:
+        int_generator() {}
+
+        /// advances the engine's state and returns the generated value
+        int_type operator()() {
+            return 0;
+        }
+};
+
+} // namespace none
+} // namespace random
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_RANDOM_NONE_HPP
diff --git a/vendor/websocketpp/websocketpp/random/random_device.hpp b/vendor/websocketpp/websocketpp/random/random_device.hpp
new file mode 100644
index 0000000..91e7dd1
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/random/random_device.hpp
@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
+#define WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
+
+#include <websocketpp/common/random.hpp>
+
+namespace websocketpp {
+namespace random {
+/// RNG policy based on std::random_device or boost::random_device
+namespace random_device {
+
+/// Thread safe non-deterministic random integer generator.
+/**
+ * This template class provides thread safe non-deterministic random integer
+ * generation. Numbers are produced in a uniformly distributed range from the
+ * smallest to largest value that int_type can store.
+ *
+ * Thread-safety is provided via locking based on the concurrency template
+ * parameter.
+ *
+ * Non-deterministic RNG is provided via websocketpp::lib which uses either
+ * C++11 or Boost 1.47+'s random_device class.
+ *
+ * Call operator() to generate the next number
+ */
+template <typename int_type, typename concurrency>
+class int_generator {
+    public:
+        typedef typename concurrency::scoped_lock_type scoped_lock_type;
+        typedef typename concurrency::mutex_type mutex_type;
+
+        /// constructor
+        //mac TODO: figure out if signed types present a range problem
+        int_generator() {}
+
+        /// advances the engine's state and returns the generated value
+        int_type operator()() {
+            scoped_lock_type guard(m_lock);
+            return m_dis(m_rng);
+        }
+    private:
+
+
+        lib::random_device m_rng;
+        lib::uniform_int_distribution<int_type> m_dis;
+
+        mutex_type m_lock;
+};
+
+} // namespace random_device
+} // namespace random
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_RANDOM_RANDOM_DEVICE_HPP
diff --git a/vendor/websocketpp/websocketpp/roles/client_endpoint.hpp b/vendor/websocketpp/websocketpp/roles/client_endpoint.hpp
new file mode 100644
index 0000000..2de1a10
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/roles/client_endpoint.hpp
@@ -0,0 +1,173 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_CLIENT_ENDPOINT_HPP
+#define WEBSOCKETPP_CLIENT_ENDPOINT_HPP
+
+#include <websocketpp/endpoint.hpp>
+#include <websocketpp/uri.hpp>
+
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/system_error.hpp>
+
+#include <string>
+
+namespace websocketpp {
+
+/// Client endpoint role based on the given config
+/**
+ *
+ */
+template <typename config>
+class client : public endpoint<connection<config>,config> {
+public:
+    /// Type of this endpoint
+    typedef client<config> type;
+
+    /// Type of the endpoint concurrency component
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of the endpoint transport component
+    typedef typename config::transport_type transport_type;
+
+    /// Type of the connections this server will create
+    typedef connection<config> connection_type;
+    /// Type of a shared pointer to the connections this server will create
+    typedef typename connection_type::ptr connection_ptr;
+
+    /// Type of the connection transport component
+    typedef typename transport_type::transport_con_type transport_con_type;
+    /// Type of a shared pointer to the connection transport component
+    typedef typename transport_con_type::ptr transport_con_ptr;
+
+    /// Type of the endpoint component of this server
+    typedef endpoint<connection_type,config> endpoint_type;
+
+    friend class connection<config>;
+
+    explicit client() : endpoint_type(false)
+    {
+        endpoint_type::m_alog.write(log::alevel::devel, "client constructor");
+    }
+
+    /// Get a new connection
+    /**
+     * Creates and returns a pointer to a new connection to the given URI
+     * suitable for passing to connect(connection_ptr). This method allows
+     * applying connection specific settings before performing the opening
+     * handshake.
+     *
+     * @param [in] location URI to open the connection to as a uri_ptr
+     * @param [out] ec An status code indicating failure reasons, if any
+     *
+     * @return A connection_ptr to the new connection
+     */
+    connection_ptr get_connection(uri_ptr location, lib::error_code & ec) {
+        if (location->get_secure() && !transport_type::is_secure()) {
+            ec = error::make_error_code(error::endpoint_not_secure);
+            return connection_ptr();
+        }
+
+        connection_ptr con = endpoint_type::create_connection();
+
+        if (!con) {
+            ec = error::make_error_code(error::con_creation_failed);
+            return con;
+        }
+
+        con->set_uri(location);
+
+        ec = lib::error_code();
+        return con;
+    }
+
+    /// Get a new connection (string version)
+    /**
+     * Creates and returns a pointer to a new connection to the given URI
+     * suitable for passing to connect(connection_ptr). This overload allows
+     * default construction of the uri_ptr from a standard string.
+     *
+     * @param [in] u URI to open the connection to as a string
+     * @param [out] ec An status code indicating failure reasons, if any
+     *
+     * @return A connection_ptr to the new connection
+     */
+    connection_ptr get_connection(std::string const & u, lib::error_code & ec) {
+        uri_ptr location = lib::make_shared<uri>(u);
+
+        if (!location->get_valid()) {
+            ec = error::make_error_code(error::invalid_uri);
+            return connection_ptr();
+        }
+
+        return get_connection(location, ec);
+    }
+
+    /// Begin the connection process for the given connection
+    /**
+     * Initiates the opening connection handshake for connection con. Exact
+     * behavior depends on the underlying transport policy.
+     *
+     * @param con The connection to connect
+     *
+     * @return The pointer to the connection originally passed in.
+     */
+    connection_ptr connect(connection_ptr con) {
+        // Ask transport to perform a connection
+        transport_type::async_connect(
+            lib::static_pointer_cast<transport_con_type>(con),
+            con->get_uri(),
+            lib::bind(
+                &type::handle_connect,
+                this,
+                con,
+                lib::placeholders::_1
+            )
+        );
+
+        return con;
+    }
+private:
+    // handle_connect
+    void handle_connect(connection_ptr con, lib::error_code const & ec) {
+        if (ec) {
+            con->terminate(ec);
+
+            endpoint_type::m_elog.write(log::elevel::rerror,
+                    "handle_connect error: "+ec.message());
+        } else {
+            endpoint_type::m_alog.write(log::alevel::connect,
+                "Successful connection");
+
+            con->start();
+        }
+    }
+};
+
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_CLIENT_ENDPOINT_HPP
diff --git a/vendor/websocketpp/websocketpp/roles/server_endpoint.hpp b/vendor/websocketpp/websocketpp/roles/server_endpoint.hpp
new file mode 100644
index 0000000..d76eea8
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/roles/server_endpoint.hpp
@@ -0,0 +1,190 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_SERVER_ENDPOINT_HPP
+#define WEBSOCKETPP_SERVER_ENDPOINT_HPP
+
+#include <websocketpp/endpoint.hpp>
+
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/system_error.hpp>
+
+namespace websocketpp {
+
+/// Server endpoint role based on the given config
+/**
+ *
+ */
+template <typename config>
+class server : public endpoint<connection<config>,config> {
+public:
+    /// Type of this endpoint
+    typedef server<config> type;
+
+    /// Type of the endpoint concurrency component
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of the endpoint transport component
+    typedef typename config::transport_type transport_type;
+
+    /// Type of the connections this server will create
+    typedef connection<config> connection_type;
+    /// Type of a shared pointer to the connections this server will create
+    typedef typename connection_type::ptr connection_ptr;
+
+    /// Type of the connection transport component
+    typedef typename transport_type::transport_con_type transport_con_type;
+    /// Type of a shared pointer to the connection transport component
+    typedef typename transport_con_type::ptr transport_con_ptr;
+
+    /// Type of the endpoint component of this server
+    typedef endpoint<connection_type,config> endpoint_type;
+
+    friend class connection<config>;
+
+    explicit server() : endpoint_type(true)
+    {
+        endpoint_type::m_alog.write(log::alevel::devel, "server constructor");
+    }
+
+    /// Destructor
+    ~server<config>() {}
+
+#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+    // no copy constructor because endpoints are not copyable
+    server<config>(server<config> &) = delete;
+    
+    // no copy assignment operator because endpoints are not copyable
+    server<config> & operator=(server<config> const &) = delete;
+#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+
+#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+    /// Move constructor
+    server<config>(server<config> && o) : endpoint<connection<config>,config>(std::move(o)) {}
+
+#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+    // no move assignment operator because of const member variables
+    server<config> & operator=(server<config> &&) = delete;
+#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+
+#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
+
+    /// Create and initialize a new connection
+    /**
+     * The connection will be initialized and ready to begin. Call its start()
+     * method to begin the processing loop.
+     *
+     * Note: The connection must either be started or terminated using
+     * connection::terminate in order to avoid memory leaks.
+     *
+     * @return A pointer to the new connection.
+     */
+    connection_ptr get_connection() {
+        return endpoint_type::create_connection();
+    }
+
+    /// Starts the server's async connection acceptance loop (exception free)
+    /**
+     * Initiates the server connection acceptance loop. Must be called after
+     * listen. This method will have no effect until the underlying io_service
+     * starts running. It may be called after the io_service is already running.
+     *
+     * Refer to documentation for the transport policy you are using for
+     * instructions on how to stop this acceptance loop.
+     * 
+     * @param [out] ec A status code indicating an error, if any.
+     */
+    void start_accept(lib::error_code & ec) {
+        if (!transport_type::is_listening()) {
+            ec = error::make_error_code(error::async_accept_not_listening);
+            return;
+        }
+        
+        ec = lib::error_code();
+        connection_ptr con = get_connection();
+        
+        transport_type::async_accept(
+            lib::static_pointer_cast<transport_con_type>(con),
+            lib::bind(&type::handle_accept,this,con,lib::placeholders::_1),
+            ec
+        );
+        
+        if (ec && con) {
+            // If the connection was constructed but the accept failed,
+            // terminate the connection to prevent memory leaks
+            con->terminate(lib::error_code());
+        }
+    }
+
+    /// Starts the server's async connection acceptance loop
+    /**
+     * Initiates the server connection acceptance loop. Must be called after
+     * listen. This method will have no effect until the underlying io_service
+     * starts running. It may be called after the io_service is already running.
+     *
+     * Refer to documentation for the transport policy you are using for
+     * instructions on how to stop this acceptance loop.
+     */
+    void start_accept() {
+        lib::error_code ec;
+        start_accept(ec);
+        if (ec) {
+            throw exception(ec);
+        }
+    }
+
+    /// Handler callback for start_accept
+    void handle_accept(connection_ptr con, lib::error_code const & ec) {
+        if (ec) {
+            con->terminate(ec);
+
+            if (ec == error::operation_canceled) {
+                endpoint_type::m_elog.write(log::elevel::info,
+                    "handle_accept error: "+ec.message());
+            } else {
+                endpoint_type::m_elog.write(log::elevel::rerror,
+                    "handle_accept error: "+ec.message());
+            }
+        } else {
+            con->start();
+        }
+
+        lib::error_code start_ec;
+        start_accept(start_ec);
+        if (start_ec == error::async_accept_not_listening) {
+            endpoint_type::m_elog.write(log::elevel::info,
+                "Stopping acceptance of new connections because the underlying transport is no longer listening.");
+        } else if (start_ec) {
+            endpoint_type::m_elog.write(log::elevel::rerror,
+                "Restarting async_accept loop failed: "+ec.message());
+        }
+    }
+};
+
+} // namespace websocketpp
+
+#endif //WEBSOCKETPP_SERVER_ENDPOINT_HPP
diff --git a/vendor/websocketpp/websocketpp/server.hpp b/vendor/websocketpp/websocketpp/server.hpp
new file mode 100644
index 0000000..342fa8c
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/server.hpp
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_SERVER_HPP
+#define WEBSOCKETPP_SERVER_HPP
+
+#include <websocketpp/roles/server_endpoint.hpp>
+
+#endif //WEBSOCKETPP_SERVER_HPP
diff --git a/vendor/websocketpp/websocketpp/sha1/sha1.hpp b/vendor/websocketpp/websocketpp/sha1/sha1.hpp
new file mode 100644
index 0000000..43a8433
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/sha1/sha1.hpp
@@ -0,0 +1,189 @@
+/*
+*****
+sha1.hpp is a repackaging of the sha1.cpp and sha1.h files from the smallsha1
+library (http://code.google.com/p/smallsha1/) into a single header suitable for
+use as a header only library. This conversion was done by Peter Thorson
+(webmaster@zaphoyd.com) in 2013. All modifications to the code are redistributed
+under the same license as the original, which is listed below.
+*****
+
+ Copyright (c) 2011, Micael Hildenborg
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+    * Neither the name of Micael Hildenborg nor the
+      names of its contributors may be used to endorse or promote products
+      derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY Micael Hildenborg ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL Micael Hildenborg BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SHA1_DEFINED
+#define SHA1_DEFINED
+
+namespace websocketpp {
+namespace sha1 {
+
+namespace { // local
+
+// Rotate an integer value to left.
+inline unsigned int rol(unsigned int value, unsigned int steps) {
+    return ((value << steps) | (value >> (32 - steps)));
+}
+
+// Sets the first 16 integers in the buffert to zero.
+// Used for clearing the W buffert.
+inline void clearWBuffert(unsigned int * buffert)
+{
+    for (int pos = 16; --pos >= 0;)
+    {
+        buffert[pos] = 0;
+    }
+}
+
+inline void innerHash(unsigned int * result, unsigned int * w)
+{
+    unsigned int a = result[0];
+    unsigned int b = result[1];
+    unsigned int c = result[2];
+    unsigned int d = result[3];
+    unsigned int e = result[4];
+
+    int round = 0;
+
+    #define sha1macro(func,val) \
+    { \
+        const unsigned int t = rol(a, 5) + (func) + e + val + w[round]; \
+        e = d; \
+        d = c; \
+        c = rol(b, 30); \
+        b = a; \
+        a = t; \
+    }
+
+    while (round < 16)
+    {
+        sha1macro((b & c) | (~b & d), 0x5a827999)
+        ++round;
+    }
+    while (round < 20)
+    {
+        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
+        sha1macro((b & c) | (~b & d), 0x5a827999)
+        ++round;
+    }
+    while (round < 40)
+    {
+        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
+        sha1macro(b ^ c ^ d, 0x6ed9eba1)
+        ++round;
+    }
+    while (round < 60)
+    {
+        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
+        sha1macro((b & c) | (b & d) | (c & d), 0x8f1bbcdc)
+        ++round;
+    }
+    while (round < 80)
+    {
+        w[round] = rol((w[round - 3] ^ w[round - 8] ^ w[round - 14] ^ w[round - 16]), 1);
+        sha1macro(b ^ c ^ d, 0xca62c1d6)
+        ++round;
+    }
+
+    #undef sha1macro
+
+    result[0] += a;
+    result[1] += b;
+    result[2] += c;
+    result[3] += d;
+    result[4] += e;
+}
+
+} // namespace
+
+/// Calculate a SHA1 hash
+/**
+ * @param src points to any kind of data to be hashed.
+ * @param bytelength the number of bytes to hash from the src pointer.
+ * @param hash should point to a buffer of at least 20 bytes of size for storing
+ * the sha1 result in.
+ */
+inline void calc(void const * src, size_t bytelength, unsigned char * hash) {
+    // Init the result array.
+    unsigned int result[5] = { 0x67452301, 0xefcdab89, 0x98badcfe,
+                               0x10325476, 0xc3d2e1f0 };
+
+    // Cast the void src pointer to be the byte array we can work with.
+    unsigned char const * sarray = (unsigned char const *) src;
+
+    // The reusable round buffer
+    unsigned int w[80];
+
+    // Loop through all complete 64byte blocks.
+
+    size_t endCurrentBlock;
+    size_t currentBlock = 0;
+
+    if (bytelength >= 64) {
+        size_t const endOfFullBlocks = bytelength - 64;
+
+        while (currentBlock <= endOfFullBlocks) {
+            endCurrentBlock = currentBlock + 64;
+
+            // Init the round buffer with the 64 byte block data.
+            for (int roundPos = 0; currentBlock < endCurrentBlock; currentBlock += 4)
+            {
+                // This line will swap endian on big endian and keep endian on
+                // little endian.
+                w[roundPos++] = (unsigned int) sarray[currentBlock + 3]
+                        | (((unsigned int) sarray[currentBlock + 2]) << 8)
+                        | (((unsigned int) sarray[currentBlock + 1]) << 16)
+                        | (((unsigned int) sarray[currentBlock]) << 24);
+            }
+            innerHash(result, w);
+        }
+    }
+
+    // Handle the last and not full 64 byte block if existing.
+    endCurrentBlock = bytelength - currentBlock;
+    clearWBuffert(w);
+    size_t lastBlockBytes = 0;
+    for (;lastBlockBytes < endCurrentBlock; ++lastBlockBytes) {
+        w[lastBlockBytes >> 2] |= (unsigned int) sarray[lastBlockBytes + currentBlock] << ((3 - (lastBlockBytes & 3)) << 3);
+    }
+
+    w[lastBlockBytes >> 2] |= 0x80 << ((3 - (lastBlockBytes & 3)) << 3);
+    if (endCurrentBlock >= 56) {
+        innerHash(result, w);
+        clearWBuffert(w);
+    }
+    w[15] = bytelength << 3;
+    innerHash(result, w);
+
+    // Store hash in result pointer, and make sure we get in in the correct
+    // order on both endian models.
+    for (int hashByte = 20; --hashByte >= 0;) {
+        hash[hashByte] = (result[hashByte >> 2] >> (((3 - hashByte) & 0x3) << 3)) & 0xff;
+    }
+}
+
+} // namespace sha1
+} // namespace websocketpp
+
+#endif // SHA1_DEFINED
diff --git a/vendor/websocketpp/websocketpp/transport/asio/base.hpp b/vendor/websocketpp/websocketpp/transport/asio/base.hpp
new file mode 100644
index 0000000..b945fe1
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/asio/base.hpp
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_ASIO_BASE_HPP
+#define WEBSOCKETPP_TRANSPORT_ASIO_BASE_HPP
+
+#include <websocketpp/common/asio.hpp>
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/functional.hpp>
+#include <websocketpp/common/system_error.hpp>
+#include <websocketpp/common/type_traits.hpp>
+
+#include <string>
+
+namespace websocketpp {
+namespace transport {
+/// Transport policy that uses asio
+/**
+ * This policy uses a single asio io_service to provide transport
+ * services to a WebSocket++ endpoint.
+ */
+namespace asio {
+
+// Class to manage the memory to be used for handler-based custom allocation.
+// It contains a single block of memory which may be returned for allocation
+// requests. If the memory is in use when an allocation request is made, the
+// allocator delegates allocation to the global heap.
+class handler_allocator {
+public:
+    static const size_t size = 1024;
+    
+    handler_allocator() : m_in_use(false) {}
+
+#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+	handler_allocator(handler_allocator const & cpy) = delete;
+	handler_allocator & operator =(handler_allocator const &) = delete;
+#endif
+
+    void * allocate(std::size_t memsize) {
+        if (!m_in_use && memsize < size) {
+            m_in_use = true;
+            return static_cast<void*>(&m_storage);
+        } else {
+            return ::operator new(memsize);
+        }
+    }
+
+    void deallocate(void * pointer) {
+        if (pointer == &m_storage) {
+            m_in_use = false;
+        } else {
+            ::operator delete(pointer);
+        }
+    }
+
+private:
+    // Storage space used for handler-based custom memory allocation.
+    lib::aligned_storage<size>::type m_storage;
+
+    // Whether the handler-based custom allocation storage has been used.
+    bool m_in_use;
+};
+
+// Wrapper class template for handler objects to allow handler memory
+// allocation to be customised. Calls to operator() are forwarded to the
+// encapsulated handler.
+template <typename Handler>
+class custom_alloc_handler {
+public:
+    custom_alloc_handler(handler_allocator& a, Handler h)
+      : allocator_(a),
+        handler_(h)
+    {}
+
+    template <typename Arg1>
+    void operator()(Arg1 arg1) {
+        handler_(arg1);
+    }
+
+    template <typename Arg1, typename Arg2>
+    void operator()(Arg1 arg1, Arg2 arg2) {
+        handler_(arg1, arg2);
+    }
+
+    friend void* asio_handler_allocate(std::size_t size,
+        custom_alloc_handler<Handler> * this_handler)
+    {
+        return this_handler->allocator_.allocate(size);
+    }
+
+    friend void asio_handler_deallocate(void* pointer, std::size_t /*size*/,
+        custom_alloc_handler<Handler> * this_handler)
+    {
+        this_handler->allocator_.deallocate(pointer);
+    }
+
+private:
+    handler_allocator & allocator_;
+    Handler handler_;
+};
+
+// Helper function to wrap a handler object to add custom allocation.
+template <typename Handler>
+inline custom_alloc_handler<Handler> make_custom_alloc_handler(
+    handler_allocator & a, Handler h)
+{
+    return custom_alloc_handler<Handler>(a, h);
+}
+
+
+
+
+
+
+
+// Forward declaration of class endpoint so that it can be friended/referenced
+// before being included.
+template <typename config>
+class endpoint;
+
+typedef lib::function<void (lib::asio::error_code const & ec,
+    size_t bytes_transferred)> async_read_handler;
+
+typedef lib::function<void (lib::asio::error_code const & ec,
+    size_t bytes_transferred)> async_write_handler;
+
+typedef lib::function<void (lib::error_code const & ec)> pre_init_handler;
+
+// handle_timer: dynamic parameters, multiple copies
+// handle_proxy_write
+// handle_proxy_read
+// handle_async_write
+// handle_pre_init
+
+
+/// Asio transport errors
+namespace error {
+enum value {
+    /// Catch-all error for transport policy errors that don't fit in other
+    /// categories
+    general = 1,
+
+    /// async_read_at_least call requested more bytes than buffer can store
+    invalid_num_bytes,
+
+    /// there was an error in the underlying transport library
+    pass_through,
+
+    /// The connection to the requested proxy server failed
+    proxy_failed,
+
+    /// Invalid Proxy URI
+    proxy_invalid,
+
+    /// Invalid host or service
+    invalid_host_service
+};
+
+/// Asio transport error category
+class category : public lib::error_category {
+public:
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.transport.asio";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case error::general:
+                return "Generic asio transport policy error";
+            case error::invalid_num_bytes:
+                return "async_read_at_least call requested more bytes than buffer can store";
+            case error::pass_through:
+                return "Underlying Transport Error";
+            case error::proxy_failed:
+                return "Proxy connection failed";
+            case error::proxy_invalid:
+                return "Invalid proxy URI";
+            case error::invalid_host_service:
+                return "Invalid host or service";
+            default:
+                return "Unknown";
+        }
+    }
+};
+
+/// Get a reference to a static copy of the asio transport error category
+inline lib::error_category const & get_category() {
+    static category instance;
+    return instance;
+}
+
+/// Create an error code with the given value and the asio transport category
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_category());
+}
+
+} // namespace error
+} // namespace asio
+} // namespace transport
+} // namespace websocketpp
+
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum<websocketpp::transport::asio::error::value>
+{
+    static bool const value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+#endif // WEBSOCKETPP_TRANSPORT_ASIO_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/asio/connection.hpp b/vendor/websocketpp/websocketpp/transport/asio/connection.hpp
new file mode 100644
index 0000000..8eb8c75
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/asio/connection.hpp
@@ -0,0 +1,1204 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_ASIO_CON_HPP
+#define WEBSOCKETPP_TRANSPORT_ASIO_CON_HPP
+
+#include <websocketpp/transport/asio/base.hpp>
+
+#include <websocketpp/transport/base/connection.hpp>
+
+#include <websocketpp/logger/levels.hpp>
+#include <websocketpp/http/constants.hpp>
+
+#include <websocketpp/base64/base64.hpp>
+#include <websocketpp/error.hpp>
+#include <websocketpp/uri.hpp>
+
+#include <websocketpp/common/asio.hpp>
+#include <websocketpp/common/chrono.hpp>
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/common/functional.hpp>
+#include <websocketpp/common/connection_hdl.hpp>
+
+#include <istream>
+#include <sstream>
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace transport {
+namespace asio {
+
+typedef lib::function<void(connection_hdl)> tcp_init_handler;
+
+/// Asio based connection transport component
+/**
+ * transport::asio::connection implements a connection transport component using
+ * Asio that works with the transport::asio::endpoint endpoint transport
+ * component.
+ */
+template <typename config>
+class connection : public config::socket_type::socket_con_type {
+public:
+    /// Type of this connection transport component
+    typedef connection<config> type;
+    /// Type of a shared pointer to this connection transport component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// Type of the socket connection component
+    typedef typename config::socket_type::socket_con_type socket_con_type;
+    /// Type of a shared pointer to the socket connection component
+    typedef typename socket_con_type::ptr socket_con_ptr;
+    /// Type of this transport's access logging policy
+    typedef typename config::alog_type alog_type;
+    /// Type of this transport's error logging policy
+    typedef typename config::elog_type elog_type;
+
+    typedef typename config::request_type request_type;
+    typedef typename request_type::ptr request_ptr;
+    typedef typename config::response_type response_type;
+    typedef typename response_type::ptr response_ptr;
+
+    /// Type of a pointer to the Asio io_service being used
+    typedef lib::asio::io_service * io_service_ptr;
+    /// Type of a pointer to the Asio io_service::strand being used
+    typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr;
+    /// Type of a pointer to the Asio timer class
+    typedef lib::shared_ptr<lib::asio::steady_timer> timer_ptr;
+
+    // connection is friends with its associated endpoint to allow the endpoint
+    // to call private/protected utility methods that we don't want to expose
+    // to the public api.
+    friend class endpoint<config>;
+
+    // generate and manage our own io_service
+    explicit connection(bool is_server, alog_type & alog, elog_type & elog)
+      : m_is_server(is_server)
+      , m_alog(alog)
+      , m_elog(elog)
+    {
+        m_alog.write(log::alevel::devel,"asio con transport constructor");
+    }
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return lib::static_pointer_cast<type>(socket_con_type::get_shared());
+    }
+
+    bool is_secure() const {
+        return socket_con_type::is_secure();
+    }
+
+    /// Set uri hook
+    /**
+     * Called by the endpoint as a connection is being established to provide
+     * the uri being connected to to the transport layer.
+     *
+     * This transport policy doesn't use the uri except to forward it to the 
+     * socket layer.
+     *
+     * @since 0.6.0
+     *
+     * @param u The uri to set
+     */
+    void set_uri(uri_ptr u) {
+        socket_con_type::set_uri(u);
+    }
+
+    /// Sets the tcp pre init handler
+    /**
+     * The tcp pre init handler is called after the raw tcp connection has been
+     * established but before any additional wrappers (proxy connects, TLS
+     * handshakes, etc) have been performed.
+     *
+     * @since 0.3.0
+     *
+     * @param h The handler to call on tcp pre init.
+     */
+    void set_tcp_pre_init_handler(tcp_init_handler h) {
+        m_tcp_pre_init_handler = h;
+    }
+
+    /// Sets the tcp pre init handler (deprecated)
+    /**
+     * The tcp pre init handler is called after the raw tcp connection has been
+     * established but before any additional wrappers (proxy connects, TLS
+     * handshakes, etc) have been performed.
+     *
+     * @deprecated Use set_tcp_pre_init_handler instead
+     *
+     * @param h The handler to call on tcp pre init.
+     */
+    void set_tcp_init_handler(tcp_init_handler h) {
+        set_tcp_pre_init_handler(h);
+    }
+
+    /// Sets the tcp post init handler
+    /**
+     * The tcp post init handler is called after the tcp connection has been
+     * established and all additional wrappers (proxy connects, TLS handshakes,
+     * etc have been performed. This is fired before any bytes are read or any
+     * WebSocket specific handshake logic has been performed.
+     *
+     * @since 0.3.0
+     *
+     * @param h The handler to call on tcp post init.
+     */
+    void set_tcp_post_init_handler(tcp_init_handler h) {
+        m_tcp_post_init_handler = h;
+    }
+
+    /// Set the proxy to connect through (exception free)
+    /**
+     * The URI passed should be a complete URI including scheme. For example:
+     * http://proxy.example.com:8080/
+     *
+     * The proxy must be set up as an explicit (CONNECT) proxy allowed to
+     * connect to the port you specify. Traffic to the proxy is not encrypted.
+     *
+     * @param uri The full URI of the proxy to connect to.
+     *
+     * @param ec A status value
+     */
+    void set_proxy(std::string const & uri, lib::error_code & ec) {
+        // TODO: return errors for illegal URIs here?
+        // TODO: should https urls be illegal for the moment?
+        m_proxy = uri;
+        m_proxy_data = lib::make_shared<proxy_data>();
+        ec = lib::error_code();
+    }
+
+    /// Set the proxy to connect through (exception)
+    void set_proxy(std::string const & uri) {
+        lib::error_code ec;
+        set_proxy(uri,ec);
+        if (ec) { throw exception(ec); }
+    }
+
+    /// Set the basic auth credentials to use (exception free)
+    /**
+     * The URI passed should be a complete URI including scheme. For example:
+     * http://proxy.example.com:8080/
+     *
+     * The proxy must be set up as an explicit proxy
+     *
+     * @param username The username to send
+     *
+     * @param password The password to send
+     *
+     * @param ec A status value
+     */
+    void set_proxy_basic_auth(std::string const & username, std::string const &
+        password, lib::error_code & ec)
+    {
+        if (!m_proxy_data) {
+            ec = make_error_code(websocketpp::error::invalid_state);
+            return;
+        }
+
+        // TODO: username can't contain ':'
+        std::string val = "Basic "+base64_encode(username + ":" + password);
+        m_proxy_data->req.replace_header("Proxy-Authorization",val);
+        ec = lib::error_code();
+    }
+
+    /// Set the basic auth credentials to use (exception)
+    void set_proxy_basic_auth(std::string const & username, std::string const &
+        password)
+    {
+        lib::error_code ec;
+        set_proxy_basic_auth(username,password,ec);
+        if (ec) { throw exception(ec); }
+    }
+
+    /// Set the proxy timeout duration (exception free)
+    /**
+     * Duration is in milliseconds. Default value is based on the transport
+     * config
+     *
+     * @param duration The number of milliseconds to wait before aborting the
+     * proxy connection.
+     *
+     * @param ec A status value
+     */
+    void set_proxy_timeout(long duration, lib::error_code & ec) {
+        if (!m_proxy_data) {
+            ec = make_error_code(websocketpp::error::invalid_state);
+            return;
+        }
+
+        m_proxy_data->timeout_proxy = duration;
+        ec = lib::error_code();
+    }
+
+    /// Set the proxy timeout duration (exception)
+    void set_proxy_timeout(long duration) {
+        lib::error_code ec;
+        set_proxy_timeout(duration,ec);
+        if (ec) { throw exception(ec); }
+    }
+
+    std::string const & get_proxy() const {
+        return m_proxy;
+    }
+
+    /// Get the remote endpoint address
+    /**
+     * The iostream transport has no information about the ultimate remote
+     * endpoint. It will return the string "iostream transport". To indicate
+     * this.
+     *
+     * TODO: allow user settable remote endpoint addresses if this seems useful
+     *
+     * @return A string identifying the address of the remote endpoint
+     */
+    std::string get_remote_endpoint() const {
+        lib::error_code ec;
+
+        std::string ret = socket_con_type::get_remote_endpoint(ec);
+
+        if (ec) {
+            m_elog.write(log::elevel::info,ret);
+            return "Unknown";
+        } else {
+            return ret;
+        }
+    }
+
+    /// Get the connection handle
+    connection_hdl get_handle() const {
+        return m_connection_hdl;
+    }
+
+    /// Call back a function after a period of time.
+    /**
+     * Sets a timer that calls back a function after the specified period of
+     * milliseconds. Returns a handle that can be used to cancel the timer.
+     * A cancelled timer will return the error code error::operation_aborted
+     * A timer that expired will return no error.
+     *
+     * @param duration Length of time to wait in milliseconds
+     *
+     * @param callback The function to call back when the timer has expired
+     *
+     * @return A handle that can be used to cancel the timer if it is no longer
+     * needed.
+     */
+    timer_ptr set_timer(long duration, timer_handler callback) {
+        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
+            lib::ref(*m_io_service),
+            lib::asio::milliseconds(duration)
+        );
+
+        if (config::enable_multithreading) {
+            new_timer->async_wait(m_strand->wrap(lib::bind(
+                &type::handle_timer, get_shared(),
+                new_timer,
+                callback,
+                lib::placeholders::_1
+            )));
+        } else {
+            new_timer->async_wait(lib::bind(
+                &type::handle_timer, get_shared(),
+                new_timer,
+                callback,
+                lib::placeholders::_1
+            ));
+        }
+
+        return new_timer;
+    }
+
+    /// Timer callback
+    /**
+     * The timer pointer is included to ensure the timer isn't destroyed until
+     * after it has expired.
+     *
+     * TODO: candidate for protected status
+     *
+     * @param post_timer Pointer to the timer in question
+     * @param callback The function to call back
+     * @param ec The status code
+     */
+    void handle_timer(timer_ptr, timer_handler callback,
+        lib::asio::error_code const & ec)
+    {
+        if (ec) {
+            if (ec == lib::asio::error::operation_aborted) {
+                callback(make_error_code(transport::error::operation_aborted));
+            } else {
+                log_err(log::elevel::info,"asio handle_timer",ec);
+                callback(make_error_code(error::pass_through));
+            }
+        } else {
+            callback(lib::error_code());
+        }
+    }
+
+    /// Get a pointer to this connection's strand
+    strand_ptr get_strand() {
+        return m_strand;
+    }
+
+    /// Get the internal transport error code for a closed/failed connection
+    /**
+     * Retrieves a machine readable detailed error code indicating the reason
+     * that the connection was closed or failed. Valid only after the close or
+     * fail handler is called.
+     *
+     * Primarily used if you are using mismatched asio / system_error
+     * implementations such as `boost::asio` with `std::system_error`. In these
+     * cases the transport error type is different than the library error type
+     * and some WebSocket++ functions that return transport errors via the 
+     * library error code type will be coerced into a catch all `pass_through`
+     * or `tls_error` error. This method will return the original machine 
+     * readable transport error in the native type.
+     *
+     * @since 0.7.0
+     *
+     * @return Error code indicating the reason the connection was closed or 
+     * failed
+     */
+    lib::asio::error_code get_transport_ec() const {
+        return m_tec;
+    }
+
+    /// Initialize transport for reading
+    /**
+     * init_asio is called once immediately after construction to initialize
+     * Asio components to the io_service
+     *
+     * The transport initialization sequence consists of the following steps:
+     * - Pre-init: the underlying socket is initialized to the point where
+     * bytes may be written. No bytes are actually written in this stage
+     * - Proxy negotiation: if a proxy is set, a request is made to it to start
+     * a tunnel to the final destination. This stage ends when the proxy is
+     * ready to forward the
+     * next byte to the remote endpoint.
+     * - Post-init: Perform any i/o with the remote endpoint, such as setting up
+     * tunnels for encryption. This stage ends when the connection is ready to
+     * read or write the WebSocket handshakes. At this point the original
+     * callback function is called.
+     */
+protected:
+    void init(init_handler callback) {
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,"asio connection init");
+        }
+
+        // TODO: pre-init timeout. Right now no implemented socket policies
+        // actually have an asyncronous pre-init
+
+        socket_con_type::pre_init(
+            lib::bind(
+                &type::handle_pre_init,
+                get_shared(),
+                callback,
+                lib::placeholders::_1
+            )
+        );
+    }
+
+    /// initialize the proxy buffers and http parsers
+    /**
+     *
+     * @param authority The address of the server we want the proxy to tunnel to
+     * in the format of a URI authority (host:port)
+     *
+     * @return Status code indicating what errors occurred, if any
+     */
+    lib::error_code proxy_init(std::string const & authority) {
+        if (!m_proxy_data) {
+            return websocketpp::error::make_error_code(
+                websocketpp::error::invalid_state);
+        }
+        m_proxy_data->req.set_version("HTTP/1.1");
+        m_proxy_data->req.set_method("CONNECT");
+
+        m_proxy_data->req.set_uri(authority);
+        m_proxy_data->req.replace_header("Host",authority);
+
+        return lib::error_code();
+    }
+
+    /// Finish constructing the transport
+    /**
+     * init_asio is called once immediately after construction to initialize
+     * Asio components to the io_service.
+     *
+     * @param io_service A pointer to the io_service to register with this
+     * connection
+     *
+     * @return Status code for the success or failure of the initialization
+     */
+    lib::error_code init_asio (io_service_ptr io_service) {
+        m_io_service = io_service;
+
+        if (config::enable_multithreading) {
+            m_strand = lib::make_shared<lib::asio::io_service::strand>(
+                lib::ref(*io_service));
+        }
+
+        lib::error_code ec = socket_con_type::init_asio(io_service, m_strand,
+            m_is_server);
+
+        return ec;
+    }
+
+    void handle_pre_init(init_handler callback, lib::error_code const & ec) {
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,"asio connection handle pre_init");
+        }
+
+        if (m_tcp_pre_init_handler) {
+            m_tcp_pre_init_handler(m_connection_hdl);
+        }
+
+        if (ec) {
+            callback(ec);
+        }
+
+        // If we have a proxy set issue a proxy connect, otherwise skip to
+        // post_init
+        if (!m_proxy.empty()) {
+            proxy_write(callback);
+        } else {
+            post_init(callback);
+        }
+    }
+
+    void post_init(init_handler callback) {
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,"asio connection post_init");
+        }
+
+        timer_ptr post_timer;
+        
+        if (config::timeout_socket_post_init > 0) {
+            post_timer = set_timer(
+                config::timeout_socket_post_init,
+                lib::bind(
+                    &type::handle_post_init_timeout,
+                    get_shared(),
+                    post_timer,
+                    callback,
+                    lib::placeholders::_1
+                )
+            );
+        }
+
+        socket_con_type::post_init(
+            lib::bind(
+                &type::handle_post_init,
+                get_shared(),
+                post_timer,
+                callback,
+                lib::placeholders::_1
+            )
+        );
+    }
+
+    /// Post init timeout callback
+    /**
+     * The timer pointer is included to ensure the timer isn't destroyed until
+     * after it has expired.
+     *
+     * @param post_timer Pointer to the timer in question
+     * @param callback The function to call back
+     * @param ec The status code
+     */
+    void handle_post_init_timeout(timer_ptr, init_handler callback,
+        lib::error_code const & ec)
+    {
+        lib::error_code ret_ec;
+
+        if (ec) {
+            if (ec == transport::error::operation_aborted) {
+                m_alog.write(log::alevel::devel,
+                    "asio post init timer cancelled");
+                return;
+            }
+
+            log_err(log::elevel::devel,"asio handle_post_init_timeout",ec);
+            ret_ec = ec;
+        } else {
+            if (socket_con_type::get_ec()) {
+                ret_ec = socket_con_type::get_ec();
+            } else {
+                ret_ec = make_error_code(transport::error::timeout);
+            }
+        }
+
+        m_alog.write(log::alevel::devel, "Asio transport post-init timed out");
+        cancel_socket_checked();
+        callback(ret_ec);
+    }
+
+    /// Post init timeout callback
+    /**
+     * The timer pointer is included to ensure the timer isn't destroyed until
+     * after it has expired.
+     *
+     * @param post_timer Pointer to the timer in question
+     * @param callback The function to call back
+     * @param ec The status code
+     */
+    void handle_post_init(timer_ptr post_timer, init_handler callback,
+        lib::error_code const & ec)
+    {
+        if (ec == transport::error::operation_aborted ||
+            (post_timer && lib::asio::is_neg(post_timer->expires_from_now())))
+        {
+            m_alog.write(log::alevel::devel,"post_init cancelled");
+            return;
+        }
+
+        if (post_timer) {
+            post_timer->cancel();
+        }
+
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,"asio connection handle_post_init");
+        }
+
+        if (m_tcp_post_init_handler) {
+            m_tcp_post_init_handler(m_connection_hdl);
+        }
+
+        callback(ec);
+    }
+
+    void proxy_write(init_handler callback) {
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,"asio connection proxy_write");
+        }
+
+        if (!m_proxy_data) {
+            m_elog.write(log::elevel::library,
+                "assertion failed: !m_proxy_data in asio::connection::proxy_write");
+            callback(make_error_code(error::general));
+            return;
+        }
+
+        m_proxy_data->write_buf = m_proxy_data->req.raw();
+
+        m_bufs.push_back(lib::asio::buffer(m_proxy_data->write_buf.data(),
+                                           m_proxy_data->write_buf.size()));
+
+        m_alog.write(log::alevel::devel,m_proxy_data->write_buf);
+
+        // Set a timer so we don't wait forever for the proxy to respond
+        m_proxy_data->timer = this->set_timer(
+            m_proxy_data->timeout_proxy,
+            lib::bind(
+                &type::handle_proxy_timeout,
+                get_shared(),
+                callback,
+                lib::placeholders::_1
+            )
+        );
+
+        // Send proxy request
+        if (config::enable_multithreading) {
+            lib::asio::async_write(
+                socket_con_type::get_next_layer(),
+                m_bufs,
+                m_strand->wrap(lib::bind(
+                    &type::handle_proxy_write, get_shared(),
+                    callback,
+                    lib::placeholders::_1
+                ))
+            );
+        } else {
+            lib::asio::async_write(
+                socket_con_type::get_next_layer(),
+                m_bufs,
+                lib::bind(
+                    &type::handle_proxy_write, get_shared(),
+                    callback,
+                    lib::placeholders::_1
+                )
+            );
+        }
+    }
+
+    void handle_proxy_timeout(init_handler callback, lib::error_code const & ec)
+    {
+        if (ec == transport::error::operation_aborted) {
+            m_alog.write(log::alevel::devel,
+                "asio handle_proxy_write timer cancelled");
+            return;
+        } else if (ec) {
+            log_err(log::elevel::devel,"asio handle_proxy_write",ec);
+            callback(ec);
+        } else {
+            m_alog.write(log::alevel::devel,
+                "asio handle_proxy_write timer expired");
+            cancel_socket_checked();
+            callback(make_error_code(transport::error::timeout));
+        }
+    }
+
+    void handle_proxy_write(init_handler callback,
+        lib::asio::error_code const & ec)
+    {
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,
+                "asio connection handle_proxy_write");
+        }
+
+        m_bufs.clear();
+
+        // Timer expired or the operation was aborted for some reason.
+        // Whatever aborted it will be issuing the callback so we are safe to
+        // return
+        if (ec == lib::asio::error::operation_aborted ||
+            lib::asio::is_neg(m_proxy_data->timer->expires_from_now()))
+        {
+            m_elog.write(log::elevel::devel,"write operation aborted");
+            return;
+        }
+
+        if (ec) {
+            log_err(log::elevel::info,"asio handle_proxy_write",ec);
+            m_proxy_data->timer->cancel();
+            callback(make_error_code(error::pass_through));
+            return;
+        }
+
+        proxy_read(callback);
+    }
+
+    void proxy_read(init_handler callback) {
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,"asio connection proxy_read");
+        }
+
+        if (!m_proxy_data) {
+            m_elog.write(log::elevel::library,
+                "assertion failed: !m_proxy_data in asio::connection::proxy_read");
+            m_proxy_data->timer->cancel();
+            callback(make_error_code(error::general));
+            return;
+        }
+
+        if (config::enable_multithreading) {
+            lib::asio::async_read_until(
+                socket_con_type::get_next_layer(),
+                m_proxy_data->read_buf,
+                "\r\n\r\n",
+                m_strand->wrap(lib::bind(
+                    &type::handle_proxy_read, get_shared(),
+                    callback,
+                    lib::placeholders::_1, lib::placeholders::_2
+                ))
+            );
+        } else {
+            lib::asio::async_read_until(
+                socket_con_type::get_next_layer(),
+                m_proxy_data->read_buf,
+                "\r\n\r\n",
+                lib::bind(
+                    &type::handle_proxy_read, get_shared(),
+                    callback,
+                    lib::placeholders::_1, lib::placeholders::_2
+                )
+            );
+        }
+    }
+
+    /// Proxy read callback
+    /**
+     * @param init_handler The function to call back
+     * @param ec The status code
+     * @param bytes_transferred The number of bytes read
+     */
+    void handle_proxy_read(init_handler callback,
+        lib::asio::error_code const & ec, size_t)
+    {
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,
+                "asio connection handle_proxy_read");
+        }
+
+        // Timer expired or the operation was aborted for some reason.
+        // Whatever aborted it will be issuing the callback so we are safe to
+        // return
+        if (ec == lib::asio::error::operation_aborted ||
+            lib::asio::is_neg(m_proxy_data->timer->expires_from_now()))
+        {
+            m_elog.write(log::elevel::devel,"read operation aborted");
+            return;
+        }
+
+        // At this point there is no need to wait for the timer anymore
+        m_proxy_data->timer->cancel();
+
+        if (ec) {
+            m_elog.write(log::elevel::info,
+                "asio handle_proxy_read error: "+ec.message());
+            callback(make_error_code(error::pass_through));
+        } else {
+            if (!m_proxy_data) {
+                m_elog.write(log::elevel::library,
+                    "assertion failed: !m_proxy_data in asio::connection::handle_proxy_read");
+                callback(make_error_code(error::general));
+                return;
+            }
+
+            std::istream input(&m_proxy_data->read_buf);
+
+            m_proxy_data->res.consume(input);
+
+            if (!m_proxy_data->res.headers_ready()) {
+                // we read until the headers were done in theory but apparently
+                // they aren't. Internal endpoint error.
+                callback(make_error_code(error::general));
+                return;
+            }
+
+            m_alog.write(log::alevel::devel,m_proxy_data->res.raw());
+
+            if (m_proxy_data->res.get_status_code() != http::status_code::ok) {
+                // got an error response back
+                // TODO: expose this error in a programmatically accessible way?
+                // if so, see below for an option on how to do this.
+                std::stringstream s;
+                s << "Proxy connection error: "
+                  << m_proxy_data->res.get_status_code()
+                  << " ("
+                  << m_proxy_data->res.get_status_msg()
+                  << ")";
+                m_elog.write(log::elevel::info,s.str());
+                callback(make_error_code(error::proxy_failed));
+                return;
+            }
+
+            // we have successfully established a connection to the proxy, now
+            // we can continue and the proxy will transparently forward the
+            // WebSocket connection.
+
+            // TODO: decide if we want an on_proxy callback that would allow
+            // access to the proxy response.
+
+            // free the proxy buffers and req/res objects as they aren't needed
+            // anymore
+            m_proxy_data.reset();
+
+            // Continue with post proxy initialization
+            post_init(callback);
+        }
+    }
+
+    /// read at least num_bytes bytes into buf and then call handler.
+    void async_read_at_least(size_t num_bytes, char *buf, size_t len,
+        read_handler handler)
+    {
+        if (m_alog.static_test(log::alevel::devel)) {
+            std::stringstream s;
+            s << "asio async_read_at_least: " << num_bytes;
+            m_alog.write(log::alevel::devel,s.str());
+        }
+
+        // TODO: safety vs speed ?
+        // maybe move into an if devel block
+        /*if (num_bytes > len) {
+            m_elog.write(log::elevel::devel,
+                "asio async_read_at_least error::invalid_num_bytes");
+            handler(make_error_code(transport::error::invalid_num_bytes),
+                size_t(0));
+            return;
+        }*/
+
+        if (config::enable_multithreading) {
+            lib::asio::async_read(
+                socket_con_type::get_socket(),
+                lib::asio::buffer(buf,len),
+                lib::asio::transfer_at_least(num_bytes),
+                m_strand->wrap(make_custom_alloc_handler(
+                    m_read_handler_allocator,
+                    lib::bind(
+                        &type::handle_async_read, get_shared(),
+                        handler,
+                        lib::placeholders::_1, lib::placeholders::_2
+                    )
+                ))
+            );
+        } else {
+            lib::asio::async_read(
+                socket_con_type::get_socket(),
+                lib::asio::buffer(buf,len),
+                lib::asio::transfer_at_least(num_bytes),
+                make_custom_alloc_handler(
+                    m_read_handler_allocator,
+                    lib::bind(
+                        &type::handle_async_read, get_shared(),
+                        handler,
+                        lib::placeholders::_1, lib::placeholders::_2
+                    )
+                )
+            );    
+        }
+        
+    }
+
+    void handle_async_read(read_handler handler, lib::asio::error_code const & ec,
+        size_t bytes_transferred)
+    {
+        m_alog.write(log::alevel::devel, "asio con handle_async_read");
+
+        // translate asio error codes into more lib::error_codes
+        lib::error_code tec;
+        if (ec == lib::asio::error::eof) {
+            tec = make_error_code(transport::error::eof);
+        } else if (ec) {
+            // We don't know much more about the error at this point. As our
+            // socket/security policy if it knows more:
+            tec = socket_con_type::translate_ec(ec);
+            m_tec = ec;
+
+            if (tec == transport::error::tls_error ||
+                tec == transport::error::pass_through)
+            {
+                // These are aggregate/catch all errors. Log some human readable
+                // information to the info channel to give library users some
+                // more details about why the upstream method may have failed.
+                log_err(log::elevel::info,"asio async_read_at_least",ec);
+            }
+        }
+        if (handler) {
+            handler(tec,bytes_transferred);
+        } else {
+            // This can happen in cases where the connection is terminated while
+            // the transport is waiting on a read.
+            m_alog.write(log::alevel::devel,
+                "handle_async_read called with null read handler");
+        }
+    }
+
+    /// Initiate a potentially asyncronous write of the given buffer
+    void async_write(const char* buf, size_t len, write_handler handler) {
+        m_bufs.push_back(lib::asio::buffer(buf,len));
+
+        if (config::enable_multithreading) {
+            lib::asio::async_write(
+                socket_con_type::get_socket(),
+                m_bufs,
+                m_strand->wrap(make_custom_alloc_handler(
+                    m_write_handler_allocator,
+                    lib::bind(
+                        &type::handle_async_write, get_shared(),
+                        handler,
+                        lib::placeholders::_1, lib::placeholders::_2
+                    )
+                ))
+            );
+        } else {
+            lib::asio::async_write(
+                socket_con_type::get_socket(),
+                m_bufs,
+                make_custom_alloc_handler(
+                    m_write_handler_allocator,
+                    lib::bind(
+                        &type::handle_async_write, get_shared(),
+                        handler,
+                        lib::placeholders::_1, lib::placeholders::_2
+                    )
+                )
+            );
+        }
+    }
+
+    /// Initiate a potentially asyncronous write of the given buffers
+    void async_write(std::vector<buffer> const & bufs, write_handler handler) {
+        std::vector<buffer>::const_iterator it;
+
+        for (it = bufs.begin(); it != bufs.end(); ++it) {
+            m_bufs.push_back(lib::asio::buffer((*it).buf,(*it).len));
+        }
+
+        if (config::enable_multithreading) {
+            lib::asio::async_write(
+                socket_con_type::get_socket(),
+                m_bufs,
+                m_strand->wrap(make_custom_alloc_handler(
+                    m_write_handler_allocator,
+                    lib::bind(
+                        &type::handle_async_write, get_shared(),
+                        handler,
+                        lib::placeholders::_1, lib::placeholders::_2
+                    )
+                ))
+            );
+        } else {
+            lib::asio::async_write(
+                socket_con_type::get_socket(),
+                m_bufs,
+                make_custom_alloc_handler(
+                    m_write_handler_allocator,
+                    lib::bind(
+                        &type::handle_async_write, get_shared(),
+                        handler,
+                        lib::placeholders::_1, lib::placeholders::_2
+                    )
+                )
+            );
+        }
+    }
+
+    /// Async write callback
+    /**
+     * @param ec The status code
+     * @param bytes_transferred The number of bytes read
+     */
+    void handle_async_write(write_handler handler, lib::asio::error_code const & ec, size_t) {
+        m_bufs.clear();
+        lib::error_code tec;
+        if (ec) {
+            log_err(log::elevel::info,"asio async_write",ec);
+            tec = make_error_code(transport::error::pass_through);
+        }
+        if (handler) {
+            handler(tec);
+        } else {
+            // This can happen in cases where the connection is terminated while
+            // the transport is waiting on a read.
+            m_alog.write(log::alevel::devel,
+                "handle_async_write called with null write handler");
+        }
+    }
+
+    /// Set Connection Handle
+    /**
+     * See common/connection_hdl.hpp for information
+     *
+     * @param hdl A connection_hdl that the transport will use to refer
+     * to itself
+     */
+    void set_handle(connection_hdl hdl) {
+        m_connection_hdl = hdl;
+        socket_con_type::set_handle(hdl);
+    }
+
+    /// Trigger the on_interrupt handler
+    /**
+     * This needs to be thread safe
+     */
+    lib::error_code interrupt(interrupt_handler handler) {
+        if (config::enable_multithreading) {
+            m_io_service->post(m_strand->wrap(handler));
+        } else {
+            m_io_service->post(handler);
+        }
+        return lib::error_code();
+    }
+
+    lib::error_code dispatch(dispatch_handler handler) {
+        if (config::enable_multithreading) {
+            m_io_service->post(m_strand->wrap(handler));
+        } else {
+            m_io_service->post(handler);
+        }
+        return lib::error_code();
+    }
+
+    /*void handle_interrupt(interrupt_handler handler) {
+        handler();
+    }*/
+
+    /// close and clean up the underlying socket
+    void async_shutdown(shutdown_handler callback) {
+        if (m_alog.static_test(log::alevel::devel)) {
+            m_alog.write(log::alevel::devel,"asio connection async_shutdown");
+        }
+
+        timer_ptr shutdown_timer;
+        shutdown_timer = set_timer(
+            config::timeout_socket_shutdown,
+            lib::bind(
+                &type::handle_async_shutdown_timeout,
+                get_shared(),
+                shutdown_timer,
+                callback,
+                lib::placeholders::_1
+            )
+        );
+
+        socket_con_type::async_shutdown(
+            lib::bind(
+                &type::handle_async_shutdown,
+                get_shared(),
+                shutdown_timer,
+                callback,
+                lib::placeholders::_1
+            )
+        );
+    }
+
+    /// Async shutdown timeout handler
+    /**
+     * @param shutdown_timer A pointer to the timer to keep it in scope
+     * @param callback The function to call back
+     * @param ec The status code
+     */
+    void handle_async_shutdown_timeout(timer_ptr, init_handler callback, 
+        lib::error_code const & ec)
+    {
+        lib::error_code ret_ec;
+
+        if (ec) {
+            if (ec == transport::error::operation_aborted) {
+                m_alog.write(log::alevel::devel,
+                    "asio socket shutdown timer cancelled");
+                return;
+            }
+
+            log_err(log::elevel::devel,"asio handle_async_shutdown_timeout",ec);
+            ret_ec = ec;
+        } else {
+            ret_ec = make_error_code(transport::error::timeout);
+        }
+
+        m_alog.write(log::alevel::devel,
+            "Asio transport socket shutdown timed out");
+        cancel_socket_checked();
+        callback(ret_ec);
+    }
+
+    void handle_async_shutdown(timer_ptr shutdown_timer, shutdown_handler
+        callback, lib::asio::error_code const & ec)
+    {
+        if (ec == lib::asio::error::operation_aborted ||
+            lib::asio::is_neg(shutdown_timer->expires_from_now()))
+        {
+            m_alog.write(log::alevel::devel,"async_shutdown cancelled");
+            return;
+        }
+
+        shutdown_timer->cancel();
+
+        lib::error_code tec;
+        if (ec) {
+            if (ec == lib::asio::error::not_connected) {
+                // The socket was already closed when we tried to close it. This
+                // happens periodically (usually if a read or write fails
+                // earlier and if it is a real error will be caught at another
+                // level of the stack.
+            } else {
+                // We don't know anything more about this error, give our
+                // socket/security policy a crack at it.
+                tec = socket_con_type::translate_ec(ec);
+                m_tec = ec;
+
+                if (tec == transport::error::tls_short_read) {
+                    // TLS short read at this point is somewhat expected if both
+                    // sides try and end the connection at the same time or if
+                    // SSLv2 is being used. In general there is nothing that can
+                    // be done here other than a low level development log.
+                } else {
+                    // all other errors are effectively pass through errors of
+                    // some sort so print some detail on the info channel for
+                    // library users to look up if needed.
+                    log_err(log::elevel::info,"asio async_shutdown",ec);
+                }
+            }
+        } else {
+            if (m_alog.static_test(log::alevel::devel)) {
+                m_alog.write(log::alevel::devel,
+                    "asio con handle_async_shutdown");
+            }
+        }
+        callback(tec);
+    }
+
+    /// Cancel the underlying socket and log any errors
+    void cancel_socket_checked() {
+        lib::asio::error_code cec = socket_con_type::cancel_socket();
+        if (cec) {
+            if (cec == lib::asio::error::operation_not_supported) {
+                // cancel not supported on this OS, ignore and log at dev level
+                m_alog.write(log::alevel::devel, "socket cancel not supported");
+            } else {
+                log_err(log::elevel::warn, "socket cancel failed", cec);
+            }
+        }
+    }
+
+private:
+    /// Convenience method for logging the code and message for an error_code
+    template <typename error_type>
+    void log_err(log::level l, const char * msg, const error_type & ec) {
+        std::stringstream s;
+        s << msg << " error: " << ec << " (" << ec.message() << ")";
+        m_elog.write(l,s.str());
+    }
+
+    // static settings
+    const bool m_is_server;
+    alog_type& m_alog;
+    elog_type& m_elog;
+
+    struct proxy_data {
+        proxy_data() : timeout_proxy(config::timeout_proxy) {}
+
+        request_type req;
+        response_type res;
+        std::string write_buf;
+        lib::asio::streambuf read_buf;
+        long timeout_proxy;
+        timer_ptr timer;
+    };
+
+    std::string m_proxy;
+    lib::shared_ptr<proxy_data> m_proxy_data;
+
+    // transport resources
+    io_service_ptr  m_io_service;
+    strand_ptr      m_strand;
+    connection_hdl  m_connection_hdl;
+
+    std::vector<lib::asio::const_buffer> m_bufs;
+
+    /// Detailed internal error code
+    lib::asio::error_code m_tec;
+
+    // Handlers
+    tcp_init_handler    m_tcp_pre_init_handler;
+    tcp_init_handler    m_tcp_post_init_handler;
+
+    handler_allocator   m_read_handler_allocator;
+    handler_allocator   m_write_handler_allocator;
+};
+
+
+} // namespace asio
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_ASIO_CON_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/asio/endpoint.hpp b/vendor/websocketpp/websocketpp/transport/asio/endpoint.hpp
new file mode 100644
index 0000000..f64e847
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/asio/endpoint.hpp
@@ -0,0 +1,1147 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_ASIO_HPP
+#define WEBSOCKETPP_TRANSPORT_ASIO_HPP
+
+#include <websocketpp/transport/base/endpoint.hpp>
+#include <websocketpp/transport/asio/connection.hpp>
+#include <websocketpp/transport/asio/security/none.hpp>
+
+#include <websocketpp/uri.hpp>
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/functional.hpp>
+
+#include <sstream>
+#include <string>
+
+namespace websocketpp {
+namespace transport {
+namespace asio {
+
+/// Asio based endpoint transport component
+/**
+ * transport::asio::endpoint implements an endpoint transport component using
+ * Asio.
+ */
+template <typename config>
+class endpoint : public config::socket_type {
+public:
+    /// Type of this endpoint transport component
+    typedef endpoint<config> type;
+
+    /// Type of the concurrency policy
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of the socket policy
+    typedef typename config::socket_type socket_type;
+    /// Type of the error logging policy
+    typedef typename config::elog_type elog_type;
+    /// Type of the access logging policy
+    typedef typename config::alog_type alog_type;
+
+    /// Type of the socket connection component
+    typedef typename socket_type::socket_con_type socket_con_type;
+    /// Type of a shared pointer to the socket connection component
+    typedef typename socket_con_type::ptr socket_con_ptr;
+
+    /// Type of the connection transport component associated with this
+    /// endpoint transport component
+    typedef asio::connection<config> transport_con_type;
+    /// Type of a shared pointer to the connection transport component
+    /// associated with this endpoint transport component
+    typedef typename transport_con_type::ptr transport_con_ptr;
+
+    /// Type of a pointer to the ASIO io_service being used
+    typedef lib::asio::io_service * io_service_ptr;
+    /// Type of a shared pointer to the acceptor being used
+    typedef lib::shared_ptr<lib::asio::ip::tcp::acceptor> acceptor_ptr;
+    /// Type of a shared pointer to the resolver being used
+    typedef lib::shared_ptr<lib::asio::ip::tcp::resolver> resolver_ptr;
+    /// Type of timer handle
+    typedef lib::shared_ptr<lib::asio::steady_timer> timer_ptr;
+    /// Type of a shared pointer to an io_service work object
+    typedef lib::shared_ptr<lib::asio::io_service::work> work_ptr;
+
+    // generate and manage our own io_service
+    explicit endpoint()
+      : m_io_service(NULL)
+      , m_external_io_service(false)
+      , m_listen_backlog(lib::asio::socket_base::max_connections)
+      , m_reuse_addr(false)
+      , m_state(UNINITIALIZED)
+    {
+        //std::cout << "transport::asio::endpoint constructor" << std::endl;
+    }
+
+    ~endpoint() {
+        // clean up our io_service if we were initialized with an internal one.
+
+        // Explicitly destroy local objects
+        m_acceptor.reset();
+        m_resolver.reset();
+        m_work.reset();
+        if (m_state != UNINITIALIZED && !m_external_io_service) {
+            delete m_io_service;
+        }
+    }
+
+    /// transport::asio objects are moveable but not copyable or assignable.
+    /// The following code sets this situation up based on whether or not we
+    /// have C++11 support or not
+#ifdef _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+    endpoint(const endpoint & src) = delete;
+    endpoint& operator= (const endpoint & rhs) = delete;
+#else
+private:
+    endpoint(const endpoint & src);
+    endpoint & operator= (const endpoint & rhs);
+public:
+#endif // _WEBSOCKETPP_DEFAULT_DELETE_FUNCTIONS_
+
+#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
+    endpoint (endpoint && src)
+      : config::socket_type(std::move(src))
+      , m_tcp_pre_init_handler(src.m_tcp_pre_init_handler)
+      , m_tcp_post_init_handler(src.m_tcp_post_init_handler)
+      , m_io_service(src.m_io_service)
+      , m_external_io_service(src.m_external_io_service)
+      , m_acceptor(src.m_acceptor)
+      , m_listen_backlog(lib::asio::socket_base::max_connections)
+      , m_reuse_addr(src.m_reuse_addr)
+      , m_elog(src.m_elog)
+      , m_alog(src.m_alog)
+      , m_state(src.m_state)
+    {
+        src.m_io_service = NULL;
+        src.m_external_io_service = false;
+        src.m_acceptor = NULL;
+        src.m_state = UNINITIALIZED;
+    }
+
+    /*endpoint & operator= (const endpoint && rhs) {
+        if (this != &rhs) {
+            m_io_service = rhs.m_io_service;
+            m_external_io_service = rhs.m_external_io_service;
+            m_acceptor = rhs.m_acceptor;
+            m_listen_backlog = rhs.m_listen_backlog;
+            m_reuse_addr = rhs.m_reuse_addr;
+            m_state = rhs.m_state;
+
+            rhs.m_io_service = NULL;
+            rhs.m_external_io_service = false;
+            rhs.m_acceptor = NULL;
+            rhs.m_listen_backlog = lib::asio::socket_base::max_connections;
+            rhs.m_state = UNINITIALIZED;
+            
+            // TODO: this needs to be updated
+        }
+        return *this;
+    }*/
+#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
+
+    /// Return whether or not the endpoint produces secure connections.
+    bool is_secure() const {
+        return socket_type::is_secure();
+    }
+
+    /// initialize asio transport with external io_service (exception free)
+    /**
+     * Initialize the ASIO transport policy for this endpoint using the provided
+     * io_service object. asio_init must be called exactly once on any endpoint
+     * that uses transport::asio before it can be used.
+     *
+     * @param ptr A pointer to the io_service to use for asio events
+     * @param ec Set to indicate what error occurred, if any.
+     */
+    void init_asio(io_service_ptr ptr, lib::error_code & ec) {
+        if (m_state != UNINITIALIZED) {
+            m_elog->write(log::elevel::library,
+                "asio::init_asio called from the wrong state");
+            using websocketpp::error::make_error_code;
+            ec = make_error_code(websocketpp::error::invalid_state);
+            return;
+        }
+
+        m_alog->write(log::alevel::devel,"asio::init_asio");
+
+        m_io_service = ptr;
+        m_external_io_service = true;
+        m_acceptor = lib::make_shared<lib::asio::ip::tcp::acceptor>(
+            lib::ref(*m_io_service));
+
+        m_state = READY;
+        ec = lib::error_code();
+    }
+
+    /// initialize asio transport with external io_service
+    /**
+     * Initialize the ASIO transport policy for this endpoint using the provided
+     * io_service object. asio_init must be called exactly once on any endpoint
+     * that uses transport::asio before it can be used.
+     *
+     * @param ptr A pointer to the io_service to use for asio events
+     */
+    void init_asio(io_service_ptr ptr) {
+        lib::error_code ec;
+        init_asio(ptr,ec);
+        if (ec) { throw exception(ec); }
+    }
+
+    /// Initialize asio transport with internal io_service (exception free)
+    /**
+     * This method of initialization will allocate and use an internally managed
+     * io_service.
+     *
+     * @see init_asio(io_service_ptr ptr)
+     *
+     * @param ec Set to indicate what error occurred, if any.
+     */
+    void init_asio(lib::error_code & ec) {
+        // Use a smart pointer until the call is successful and ownership has 
+        // successfully been taken. Use unique_ptr when available.
+        // TODO: remove the use of auto_ptr when C++98/03 support is no longer
+        //       necessary.
+#ifdef _WEBSOCKETPP_CPP11_MEMORY_
+        lib::unique_ptr<lib::asio::io_service> service(new lib::asio::io_service());
+#else
+        lib::auto_ptr<lib::asio::io_service> service(new lib::asio::io_service());
+#endif
+        init_asio(service.get(), ec);
+        if( !ec ) service.release(); // Call was successful, transfer ownership
+        m_external_io_service = false;
+    }
+
+    /// Initialize asio transport with internal io_service
+    /**
+     * This method of initialization will allocate and use an internally managed
+     * io_service.
+     *
+     * @see init_asio(io_service_ptr ptr)
+     */
+    void init_asio() {
+        // Use a smart pointer until the call is successful and ownership has 
+        // successfully been taken. Use unique_ptr when available.
+        // TODO: remove the use of auto_ptr when C++98/03 support is no longer
+        //       necessary.
+#ifdef _WEBSOCKETPP_CPP11_MEMORY_
+        lib::unique_ptr<lib::asio::io_service> service(new lib::asio::io_service());
+#else
+        lib::auto_ptr<lib::asio::io_service> service(new lib::asio::io_service());
+#endif
+        init_asio( service.get() );
+        // If control got this far without an exception, then ownership has successfully been taken
+        service.release();
+        m_external_io_service = false;
+    }
+
+    /// Sets the tcp pre init handler
+    /**
+     * The tcp pre init handler is called after the raw tcp connection has been
+     * established but before any additional wrappers (proxy connects, TLS
+     * handshakes, etc) have been performed.
+     *
+     * @since 0.3.0
+     *
+     * @param h The handler to call on tcp pre init.
+     */
+    void set_tcp_pre_init_handler(tcp_init_handler h) {
+        m_tcp_pre_init_handler = h;
+    }
+
+    /// Sets the tcp pre init handler (deprecated)
+    /**
+     * The tcp pre init handler is called after the raw tcp connection has been
+     * established but before any additional wrappers (proxy connects, TLS
+     * handshakes, etc) have been performed.
+     *
+     * @deprecated Use set_tcp_pre_init_handler instead
+     *
+     * @param h The handler to call on tcp pre init.
+     */
+    void set_tcp_init_handler(tcp_init_handler h) {
+        set_tcp_pre_init_handler(h);
+    }
+
+    /// Sets the tcp post init handler
+    /**
+     * The tcp post init handler is called after the tcp connection has been
+     * established and all additional wrappers (proxy connects, TLS handshakes,
+     * etc have been performed. This is fired before any bytes are read or any
+     * WebSocket specific handshake logic has been performed.
+     *
+     * @since 0.3.0
+     *
+     * @param h The handler to call on tcp post init.
+     */
+    void set_tcp_post_init_handler(tcp_init_handler h) {
+        m_tcp_post_init_handler = h;
+    }
+
+    /// Sets the maximum length of the queue of pending connections.
+    /**
+     * Sets the maximum length of the queue of pending connections. Increasing
+     * this will allow WebSocket++ to queue additional incoming connections.
+     * Setting it higher may prevent failed connections at high connection rates
+     * but may cause additional latency.
+     *
+     * For this value to take effect you may need to adjust operating system
+     * settings.
+     *
+     * New values affect future calls to listen only.
+     *
+     * A value of zero will use the operating system default. This is the
+     * default value.
+     *
+     * @since 0.3.0
+     *
+     * @param backlog The maximum length of the queue of pending connections
+     */
+    void set_listen_backlog(int backlog) {
+        m_listen_backlog = backlog;
+    }
+
+    /// Sets whether to use the SO_REUSEADDR flag when opening listening sockets
+    /**
+     * Specifies whether or not to use the SO_REUSEADDR TCP socket option. What
+     * this flag does depends on your operating system. Please consult operating
+     * system documentation for more details.
+     *
+     * New values affect future calls to listen only.
+     *
+     * The default is false.
+     *
+     * @since 0.3.0
+     *
+     * @param value Whether or not to use the SO_REUSEADDR option
+     */
+    void set_reuse_addr(bool value) {
+        m_reuse_addr = value;
+    }
+
+    /// Retrieve a reference to the endpoint's io_service
+    /**
+     * The io_service may be an internal or external one. This may be used to
+     * call methods of the io_service that are not explicitly wrapped by the
+     * endpoint.
+     *
+     * This method is only valid after the endpoint has been initialized with
+     * `init_asio`. No error will be returned if it isn't.
+     *
+     * @return A reference to the endpoint's io_service
+     */
+    lib::asio::io_service & get_io_service() {
+        return *m_io_service;
+    }
+    
+    /// Get local TCP endpoint
+    /**
+     * Extracts the local endpoint from the acceptor. This represents the
+     * address that WebSocket++ is listening on.
+     *
+     * Sets a bad_descriptor error if the acceptor is not currently listening
+     * or otherwise unavailable.
+     * 
+     * @since 0.7.0
+     *
+     * @param ec Set to indicate what error occurred, if any.
+     * @return The local endpoint
+     */
+    lib::asio::ip::tcp::endpoint get_local_endpoint(lib::asio::error_code & ec) {
+        if (m_acceptor) {
+            return m_acceptor->local_endpoint(ec);
+        } else {
+            ec = lib::asio::error::make_error_code(lib::asio::error::bad_descriptor);
+            return lib::asio::ip::tcp::endpoint();
+        }
+    }
+
+    /// Set up endpoint for listening manually (exception free)
+    /**
+     * Bind the internal acceptor using the specified settings. The endpoint
+     * must have been initialized by calling init_asio before listening.
+     *
+     * @param ep An endpoint to read settings from
+     * @param ec Set to indicate what error occurred, if any.
+     */
+    void listen(lib::asio::ip::tcp::endpoint const & ep, lib::error_code & ec)
+    {
+        if (m_state != READY) {
+            m_elog->write(log::elevel::library,
+                "asio::listen called from the wrong state");
+            using websocketpp::error::make_error_code;
+            ec = make_error_code(websocketpp::error::invalid_state);
+            return;
+        }
+
+        m_alog->write(log::alevel::devel,"asio::listen");
+
+        lib::asio::error_code bec;
+
+        m_acceptor->open(ep.protocol(),bec);
+        if (!bec) {
+            m_acceptor->set_option(lib::asio::socket_base::reuse_address(m_reuse_addr),bec);
+        }
+        if (!bec) {
+            m_acceptor->bind(ep,bec);
+        }
+        if (!bec) {
+            m_acceptor->listen(m_listen_backlog,bec);
+        }
+        if (bec) {
+            if (m_acceptor->is_open()) {
+                m_acceptor->close();
+            }
+            log_err(log::elevel::info,"asio listen",bec);
+            ec = make_error_code(error::pass_through);
+        } else {
+            m_state = LISTENING;
+            ec = lib::error_code();
+        }
+    }
+
+    /// Set up endpoint for listening manually
+    /**
+     * Bind the internal acceptor using the settings specified by the endpoint e
+     *
+     * @param ep An endpoint to read settings from
+     */
+    void listen(lib::asio::ip::tcp::endpoint const & ep) {
+        lib::error_code ec;
+        listen(ep,ec);
+        if (ec) { throw exception(ec); }
+    }
+
+    /// Set up endpoint for listening with protocol and port (exception free)
+    /**
+     * Bind the internal acceptor using the given internet protocol and port.
+     * The endpoint must have been initialized by calling init_asio before
+     * listening.
+     *
+     * Common options include:
+     * - IPv6 with mapped IPv4 for dual stack hosts lib::asio::ip::tcp::v6()
+     * - IPv4 only: lib::asio::ip::tcp::v4()
+     *
+     * @param internet_protocol The internet protocol to use.
+     * @param port The port to listen on.
+     * @param ec Set to indicate what error occurred, if any.
+     */
+    template <typename InternetProtocol>
+    void listen(InternetProtocol const & internet_protocol, uint16_t port,
+        lib::error_code & ec)
+    {
+        lib::asio::ip::tcp::endpoint ep(internet_protocol, port);
+        listen(ep,ec);
+    }
+
+    /// Set up endpoint for listening with protocol and port
+    /**
+     * Bind the internal acceptor using the given internet protocol and port.
+     * The endpoint must have been initialized by calling init_asio before
+     * listening.
+     *
+     * Common options include:
+     * - IPv6 with mapped IPv4 for dual stack hosts lib::asio::ip::tcp::v6()
+     * - IPv4 only: lib::asio::ip::tcp::v4()
+     *
+     * @param internet_protocol The internet protocol to use.
+     * @param port The port to listen on.
+     */
+    template <typename InternetProtocol>
+    void listen(InternetProtocol const & internet_protocol, uint16_t port)
+    {
+        lib::asio::ip::tcp::endpoint ep(internet_protocol, port);
+        listen(ep);
+    }
+
+    /// Set up endpoint for listening on a port (exception free)
+    /**
+     * Bind the internal acceptor using the given port. The IPv6 protocol with
+     * mapped IPv4 for dual stack hosts will be used. If you need IPv4 only use
+     * the overload that allows specifying the protocol explicitly.
+     *
+     * The endpoint must have been initialized by calling init_asio before
+     * listening.
+     *
+     * @param port The port to listen on.
+     * @param ec Set to indicate what error occurred, if any.
+     */
+    void listen(uint16_t port, lib::error_code & ec) {
+        listen(lib::asio::ip::tcp::v6(), port, ec);
+    }
+
+    /// Set up endpoint for listening on a port
+    /**
+     * Bind the internal acceptor using the given port. The IPv6 protocol with
+     * mapped IPv4 for dual stack hosts will be used. If you need IPv4 only use
+     * the overload that allows specifying the protocol explicitly.
+     *
+     * The endpoint must have been initialized by calling init_asio before
+     * listening.
+     *
+     * @param port The port to listen on.
+     * @param ec Set to indicate what error occurred, if any.
+     */
+    void listen(uint16_t port) {
+        listen(lib::asio::ip::tcp::v6(), port);
+    }
+
+    /// Set up endpoint for listening on a host and service (exception free)
+    /**
+     * Bind the internal acceptor using the given host and service. More details
+     * about what host and service can be are available in the Asio
+     * documentation for ip::basic_resolver_query::basic_resolver_query's
+     * constructors.
+     *
+     * The endpoint must have been initialized by calling init_asio before
+     * listening.
+     *
+     * @param host A string identifying a location. May be a descriptive name or
+     * a numeric address string.
+     * @param service A string identifying the requested service. This may be a
+     * descriptive name or a numeric string corresponding to a port number.
+     * @param ec Set to indicate what error occurred, if any.
+     */
+    void listen(std::string const & host, std::string const & service,
+        lib::error_code & ec)
+    {
+        using lib::asio::ip::tcp;
+        tcp::resolver r(*m_io_service);
+        tcp::resolver::query query(host, service);
+        tcp::resolver::iterator endpoint_iterator = r.resolve(query);
+        tcp::resolver::iterator end;
+        if (endpoint_iterator == end) {
+            m_elog->write(log::elevel::library,
+                "asio::listen could not resolve the supplied host or service");
+            ec = make_error_code(error::invalid_host_service);
+            return;
+        }
+        listen(*endpoint_iterator,ec);
+    }
+
+    /// Set up endpoint for listening on a host and service
+    /**
+     * Bind the internal acceptor using the given host and service. More details
+     * about what host and service can be are available in the Asio
+     * documentation for ip::basic_resolver_query::basic_resolver_query's
+     * constructors.
+     *
+     * The endpoint must have been initialized by calling init_asio before
+     * listening.
+     *
+     * @param host A string identifying a location. May be a descriptive name or
+     * a numeric address string.
+     * @param service A string identifying the requested service. This may be a
+     * descriptive name or a numeric string corresponding to a port number.
+     * @param ec Set to indicate what error occurred, if any.
+     */
+    void listen(std::string const & host, std::string const & service)
+    {
+        lib::error_code ec;
+        listen(host,service,ec);
+        if (ec) { throw exception(ec); }
+    }
+
+    /// Stop listening (exception free)
+    /**
+     * Stop listening and accepting new connections. This will not end any
+     * existing connections.
+     *
+     * @since 0.3.0-alpha4
+     * @param ec A status code indicating an error, if any.
+     */
+    void stop_listening(lib::error_code & ec) {
+        if (m_state != LISTENING) {
+            m_elog->write(log::elevel::library,
+                "asio::listen called from the wrong state");
+            using websocketpp::error::make_error_code;
+            ec = make_error_code(websocketpp::error::invalid_state);
+            return;
+        }
+
+        m_acceptor->close();
+        m_state = READY;
+        ec = lib::error_code();
+    }
+
+    /// Stop listening
+    /**
+     * Stop listening and accepting new connections. This will not end any
+     * existing connections.
+     *
+     * @since 0.3.0-alpha4
+     */
+    void stop_listening() {
+        lib::error_code ec;
+        stop_listening(ec);
+        if (ec) { throw exception(ec); }
+    }
+
+    /// Check if the endpoint is listening
+    /**
+     * @return Whether or not the endpoint is listening.
+     */
+    bool is_listening() const {
+        return (m_state == LISTENING);
+    }
+
+    /// wraps the run method of the internal io_service object
+    std::size_t run() {
+        return m_io_service->run();
+    }
+
+    /// wraps the run_one method of the internal io_service object
+    /**
+     * @since 0.3.0-alpha4
+     */
+    std::size_t run_one() {
+        return m_io_service->run_one();
+    }
+
+    /// wraps the stop method of the internal io_service object
+    void stop() {
+        m_io_service->stop();
+    }
+
+    /// wraps the poll method of the internal io_service object
+    std::size_t poll() {
+        return m_io_service->poll();
+    }
+
+    /// wraps the poll_one method of the internal io_service object
+    std::size_t poll_one() {
+        return m_io_service->poll_one();
+    }
+
+    /// wraps the reset method of the internal io_service object
+    void reset() {
+        m_io_service->reset();
+    }
+
+    /// wraps the stopped method of the internal io_service object
+    bool stopped() const {
+        return m_io_service->stopped();
+    }
+
+    /// Marks the endpoint as perpetual, stopping it from exiting when empty
+    /**
+     * Marks the endpoint as perpetual. Perpetual endpoints will not
+     * automatically exit when they run out of connections to process. To stop
+     * a perpetual endpoint call `end_perpetual`.
+     *
+     * An endpoint may be marked perpetual at any time by any thread. It must be
+     * called either before the endpoint has run out of work or before it was
+     * started
+     *
+     * @since 0.3.0
+     */
+    void start_perpetual() {
+        m_work = lib::make_shared<lib::asio::io_service::work>(
+            lib::ref(*m_io_service)
+        );
+    }
+
+    /// Clears the endpoint's perpetual flag, allowing it to exit when empty
+    /**
+     * Clears the endpoint's perpetual flag. This will cause the endpoint's run
+     * method to exit normally when it runs out of connections. If there are
+     * currently active connections it will not end until they are complete.
+     *
+     * @since 0.3.0
+     */
+    void stop_perpetual() {
+        m_work.reset();
+    }
+
+    /// Call back a function after a period of time.
+    /**
+     * Sets a timer that calls back a function after the specified period of
+     * milliseconds. Returns a handle that can be used to cancel the timer.
+     * A cancelled timer will return the error code error::operation_aborted
+     * A timer that expired will return no error.
+     *
+     * @param duration Length of time to wait in milliseconds
+     * @param callback The function to call back when the timer has expired
+     * @return A handle that can be used to cancel the timer if it is no longer
+     * needed.
+     */
+    timer_ptr set_timer(long duration, timer_handler callback) {
+        timer_ptr new_timer = lib::make_shared<lib::asio::steady_timer>(
+            *m_io_service,
+             lib::asio::milliseconds(duration)
+        );
+
+        new_timer->async_wait(
+            lib::bind(
+                &type::handle_timer,
+                this,
+                new_timer,
+                callback,
+                lib::placeholders::_1
+            )
+        );
+
+        return new_timer;
+    }
+
+    /// Timer handler
+    /**
+     * The timer pointer is included to ensure the timer isn't destroyed until
+     * after it has expired.
+     *
+     * @param t Pointer to the timer in question
+     * @param callback The function to call back
+     * @param ec A status code indicating an error, if any.
+     */
+    void handle_timer(timer_ptr, timer_handler callback,
+        lib::asio::error_code const & ec)
+    {
+        if (ec) {
+            if (ec == lib::asio::error::operation_aborted) {
+                callback(make_error_code(transport::error::operation_aborted));
+            } else {
+                m_elog->write(log::elevel::info,
+                    "asio handle_timer error: "+ec.message());
+                log_err(log::elevel::info,"asio handle_timer",ec);
+                callback(make_error_code(error::pass_through));
+            }
+        } else {
+            callback(lib::error_code());
+        }
+    }
+
+    /// Accept the next connection attempt and assign it to con (exception free)
+    /**
+     * @param tcon The connection to accept into.
+     * @param callback The function to call when the operation is complete.
+     * @param ec A status code indicating an error, if any.
+     */
+    void async_accept(transport_con_ptr tcon, accept_handler callback,
+        lib::error_code & ec)
+    {
+        if (m_state != LISTENING) {
+            using websocketpp::error::make_error_code;
+            ec = make_error_code(websocketpp::error::async_accept_not_listening);
+            return;
+        }
+
+        m_alog->write(log::alevel::devel, "asio::async_accept");
+
+        if (config::enable_multithreading) {
+            m_acceptor->async_accept(
+                tcon->get_raw_socket(),
+                tcon->get_strand()->wrap(lib::bind(
+                    &type::handle_accept,
+                    this,
+                    callback,
+                    lib::placeholders::_1
+                ))
+            );
+        } else {
+            m_acceptor->async_accept(
+                tcon->get_raw_socket(),
+                lib::bind(
+                    &type::handle_accept,
+                    this,
+                    callback,
+                    lib::placeholders::_1
+                )
+            );
+        }
+    }
+
+    /// Accept the next connection attempt and assign it to con.
+    /**
+     * @param tcon The connection to accept into.
+     * @param callback The function to call when the operation is complete.
+     */
+    void async_accept(transport_con_ptr tcon, accept_handler callback) {
+        lib::error_code ec;
+        async_accept(tcon,callback,ec);
+        if (ec) { throw exception(ec); }
+    }
+protected:
+    /// Initialize logging
+    /**
+     * The loggers are located in the main endpoint class. As such, the
+     * transport doesn't have direct access to them. This method is called
+     * by the endpoint constructor to allow shared logging from the transport
+     * component. These are raw pointers to member variables of the endpoint.
+     * In particular, they cannot be used in the transport constructor as they
+     * haven't been constructed yet, and cannot be used in the transport
+     * destructor as they will have been destroyed by then.
+     */
+    void init_logging(alog_type* a, elog_type* e) {
+        m_alog = a;
+        m_elog = e;
+    }
+
+    void handle_accept(accept_handler callback, lib::asio::error_code const & 
+        asio_ec)
+    {
+        lib::error_code ret_ec;
+
+        m_alog->write(log::alevel::devel, "asio::handle_accept");
+
+        if (asio_ec) {
+            if (asio_ec == lib::asio::errc::operation_canceled) {
+                ret_ec = make_error_code(websocketpp::error::operation_canceled);
+            } else {
+                log_err(log::elevel::info,"asio handle_accept",asio_ec);
+                ret_ec = make_error_code(error::pass_through);
+            }
+        }
+
+        callback(ret_ec);
+    }
+
+    /// Initiate a new connection
+    // TODO: there have to be some more failure conditions here
+    void async_connect(transport_con_ptr tcon, uri_ptr u, connect_handler cb) {
+        using namespace lib::asio::ip;
+
+        // Create a resolver
+        if (!m_resolver) {
+            m_resolver = lib::make_shared<lib::asio::ip::tcp::resolver>(
+                lib::ref(*m_io_service));
+        }
+
+        tcon->set_uri(u);
+
+        std::string proxy = tcon->get_proxy();
+        std::string host;
+        std::string port;
+
+        if (proxy.empty()) {
+            host = u->get_host();
+            port = u->get_port_str();
+        } else {
+            lib::error_code ec;
+
+            uri_ptr pu = lib::make_shared<uri>(proxy);
+
+            if (!pu->get_valid()) {
+                cb(make_error_code(error::proxy_invalid));
+                return;
+            }
+
+            ec = tcon->proxy_init(u->get_authority());
+            if (ec) {
+                cb(ec);
+                return;
+            }
+
+            host = pu->get_host();
+            port = pu->get_port_str();
+        }
+
+        tcp::resolver::query query(host,port);
+
+        if (m_alog->static_test(log::alevel::devel)) {
+            m_alog->write(log::alevel::devel,
+                "starting async DNS resolve for "+host+":"+port);
+        }
+
+        timer_ptr dns_timer;
+
+        dns_timer = tcon->set_timer(
+            config::timeout_dns_resolve,
+            lib::bind(
+                &type::handle_resolve_timeout,
+                this,
+                dns_timer,
+                cb,
+                lib::placeholders::_1
+            )
+        );
+
+        if (config::enable_multithreading) {
+            m_resolver->async_resolve(
+                query,
+                tcon->get_strand()->wrap(lib::bind(
+                    &type::handle_resolve,
+                    this,
+                    tcon,
+                    dns_timer,
+                    cb,
+                    lib::placeholders::_1,
+                    lib::placeholders::_2
+                ))
+            );
+        } else {
+            m_resolver->async_resolve(
+                query,
+                lib::bind(
+                    &type::handle_resolve,
+                    this,
+                    tcon,
+                    dns_timer,
+                    cb,
+                    lib::placeholders::_1,
+                    lib::placeholders::_2
+                )
+            );
+        }
+    }
+
+    /// DNS resolution timeout handler
+    /**
+     * The timer pointer is included to ensure the timer isn't destroyed until
+     * after it has expired.
+     *
+     * @param dns_timer Pointer to the timer in question
+     * @param callback The function to call back
+     * @param ec A status code indicating an error, if any.
+     */
+    void handle_resolve_timeout(timer_ptr, connect_handler callback,
+        lib::error_code const & ec)
+    {
+        lib::error_code ret_ec;
+
+        if (ec) {
+            if (ec == transport::error::operation_aborted) {
+                m_alog->write(log::alevel::devel,
+                    "asio handle_resolve_timeout timer cancelled");
+                return;
+            }
+
+            log_err(log::elevel::devel,"asio handle_resolve_timeout",ec);
+            ret_ec = ec;
+        } else {
+            ret_ec = make_error_code(transport::error::timeout);
+        }
+
+        m_alog->write(log::alevel::devel,"DNS resolution timed out");
+        m_resolver->cancel();
+        callback(ret_ec);
+    }
+
+    void handle_resolve(transport_con_ptr tcon, timer_ptr dns_timer,
+        connect_handler callback, lib::asio::error_code const & ec,
+        lib::asio::ip::tcp::resolver::iterator iterator)
+    {
+        if (ec == lib::asio::error::operation_aborted ||
+            lib::asio::is_neg(dns_timer->expires_from_now()))
+        {
+            m_alog->write(log::alevel::devel,"async_resolve cancelled");
+            return;
+        }
+
+        dns_timer->cancel();
+
+        if (ec) {
+            log_err(log::elevel::info,"asio async_resolve",ec);
+            callback(make_error_code(error::pass_through));
+            return;
+        }
+
+        if (m_alog->static_test(log::alevel::devel)) {
+            std::stringstream s;
+            s << "Async DNS resolve successful. Results: ";
+
+            lib::asio::ip::tcp::resolver::iterator it, end;
+            for (it = iterator; it != end; ++it) {
+                s << (*it).endpoint() << " ";
+            }
+
+            m_alog->write(log::alevel::devel,s.str());
+        }
+
+        m_alog->write(log::alevel::devel,"Starting async connect");
+
+        timer_ptr con_timer;
+
+        con_timer = tcon->set_timer(
+            config::timeout_connect,
+            lib::bind(
+                &type::handle_connect_timeout,
+                this,
+                tcon,
+                con_timer,
+                callback,
+                lib::placeholders::_1
+            )
+        );
+
+        if (config::enable_multithreading) {
+            lib::asio::async_connect(
+                tcon->get_raw_socket(),
+                iterator,
+                tcon->get_strand()->wrap(lib::bind(
+                    &type::handle_connect,
+                    this,
+                    tcon,
+                    con_timer,
+                    callback,
+                    lib::placeholders::_1
+                ))
+            );
+        } else {
+            lib::asio::async_connect(
+                tcon->get_raw_socket(),
+                iterator,
+                lib::bind(
+                    &type::handle_connect,
+                    this,
+                    tcon,
+                    con_timer,
+                    callback,
+                    lib::placeholders::_1
+                )
+            );
+        }
+    }
+
+    /// Asio connect timeout handler
+    /**
+     * The timer pointer is included to ensure the timer isn't destroyed until
+     * after it has expired.
+     *
+     * @param tcon Pointer to the transport connection that is being connected
+     * @param con_timer Pointer to the timer in question
+     * @param callback The function to call back
+     * @param ec A status code indicating an error, if any.
+     */
+    void handle_connect_timeout(transport_con_ptr tcon, timer_ptr,
+        connect_handler callback, lib::error_code const & ec)
+    {
+        lib::error_code ret_ec;
+
+        if (ec) {
+            if (ec == transport::error::operation_aborted) {
+                m_alog->write(log::alevel::devel,
+                    "asio handle_connect_timeout timer cancelled");
+                return;
+            }
+
+            log_err(log::elevel::devel,"asio handle_connect_timeout",ec);
+            ret_ec = ec;
+        } else {
+            ret_ec = make_error_code(transport::error::timeout);
+        }
+
+        m_alog->write(log::alevel::devel,"TCP connect timed out");
+        tcon->cancel_socket_checked();
+        callback(ret_ec);
+    }
+
+    void handle_connect(transport_con_ptr tcon, timer_ptr con_timer,
+        connect_handler callback, lib::asio::error_code const & ec)
+    {
+        if (ec == lib::asio::error::operation_aborted ||
+            lib::asio::is_neg(con_timer->expires_from_now()))
+        {
+            m_alog->write(log::alevel::devel,"async_connect cancelled");
+            return;
+        }
+
+        con_timer->cancel();
+
+        if (ec) {
+            log_err(log::elevel::info,"asio async_connect",ec);
+            callback(make_error_code(error::pass_through));
+            return;
+        }
+
+        if (m_alog->static_test(log::alevel::devel)) {
+            m_alog->write(log::alevel::devel,
+                "Async connect to "+tcon->get_remote_endpoint()+" successful.");
+        }
+
+        callback(lib::error_code());
+    }
+
+    /// Initialize a connection
+    /**
+     * init is called by an endpoint once for each newly created connection.
+     * It's purpose is to give the transport policy the chance to perform any
+     * transport specific initialization that couldn't be done via the default
+     * constructor.
+     *
+     * @param tcon A pointer to the transport portion of the connection.
+     *
+     * @return A status code indicating the success or failure of the operation
+     */
+    lib::error_code init(transport_con_ptr tcon) {
+        m_alog->write(log::alevel::devel, "transport::asio::init");
+
+        // Initialize the connection socket component
+        socket_type::init(lib::static_pointer_cast<socket_con_type,
+            transport_con_type>(tcon));
+
+        lib::error_code ec;
+
+        ec = tcon->init_asio(m_io_service);
+        if (ec) {return ec;}
+
+        tcon->set_tcp_pre_init_handler(m_tcp_pre_init_handler);
+        tcon->set_tcp_post_init_handler(m_tcp_post_init_handler);
+
+        return lib::error_code();
+    }
+private:
+    /// Convenience method for logging the code and message for an error_code
+    template <typename error_type>
+    void log_err(log::level l, char const * msg, error_type const & ec) {
+        std::stringstream s;
+        s << msg << " error: " << ec << " (" << ec.message() << ")";
+        m_elog->write(l,s.str());
+    }
+
+    enum state {
+        UNINITIALIZED = 0,
+        READY = 1,
+        LISTENING = 2
+    };
+
+    // Handlers
+    tcp_init_handler    m_tcp_pre_init_handler;
+    tcp_init_handler    m_tcp_post_init_handler;
+
+    // Network Resources
+    io_service_ptr      m_io_service;
+    bool                m_external_io_service;
+    acceptor_ptr        m_acceptor;
+    resolver_ptr        m_resolver;
+    work_ptr            m_work;
+
+    // Network constants
+    int                 m_listen_backlog;
+    bool                m_reuse_addr;
+
+    elog_type* m_elog;
+    alog_type* m_alog;
+
+    // Transport state
+    state               m_state;
+};
+
+} // namespace asio
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_ASIO_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/asio/security/base.hpp b/vendor/websocketpp/websocketpp/transport/asio/security/base.hpp
new file mode 100644
index 0000000..0f08f40
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/asio/security/base.hpp
@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_ASIO_SOCKET_BASE_HPP
+#define WEBSOCKETPP_TRANSPORT_ASIO_SOCKET_BASE_HPP
+
+#include <websocketpp/common/asio.hpp>
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/common/functional.hpp>
+#include <websocketpp/common/system_error.hpp>
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/connection_hdl.hpp>
+
+#include <string>
+
+// Interface that sockets/security policies must implement
+
+/*
+ * Endpoint Interface
+ *
+ * bool is_secure() const;
+ * @return Whether or not the endpoint creates secure connections
+ *
+ * lib::error_code init(socket_con_ptr scon);
+ * Called by the transport after a new connection is created to initialize
+ * the socket component of the connection.
+ * @param scon Pointer to the socket component of the connection
+ * @return Error code (empty on success)
+ */
+
+
+// Connection
+// TODO
+// set_hostname(std::string hostname)
+// pre_init(init_handler);
+// post_init(init_handler);
+
+namespace websocketpp {
+namespace transport {
+namespace asio {
+namespace socket {
+
+typedef lib::function<void(lib::asio::error_code const &)> shutdown_handler;
+
+/**
+ * The transport::asio::socket::* classes are a set of security/socket related
+ * policies and support code for the ASIO transport types.
+ */
+
+/// Errors related to asio transport sockets
+namespace error {
+    enum value {
+        /// Catch-all error for security policy errors that don't fit in other
+        /// categories
+        security = 1,
+
+        /// Catch-all error for socket component errors that don't fit in other
+        /// categories
+        socket,
+
+        /// A function was called in a state that it was illegal to do so.
+        invalid_state,
+
+        /// The application was prompted to provide a TLS context and it was
+        /// empty or otherwise invalid
+        invalid_tls_context,
+
+        /// TLS Handshake Timeout
+        tls_handshake_timeout,
+
+        /// pass_through from underlying library
+        pass_through,
+
+        /// Required tls_init handler not present
+        missing_tls_init_handler,
+
+        /// TLS Handshake Failed
+        tls_handshake_failed,
+        
+        /// Failed to set TLS SNI hostname
+        tls_failed_sni_hostname
+    };
+} // namespace error
+
+/// Error category related to asio transport socket policies
+class socket_category : public lib::error_category {
+public:
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.transport.asio.socket";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case error::security:
+                return "Security policy error";
+            case error::socket:
+                return "Socket component error";
+            case error::invalid_state:
+                return "Invalid state";
+            case error::invalid_tls_context:
+                return "Invalid or empty TLS context supplied";
+            case error::tls_handshake_timeout:
+                return "TLS handshake timed out";
+            case error::pass_through:
+                return "Pass through from socket policy";
+            case error::missing_tls_init_handler:
+                return "Required tls_init handler not present.";
+            case error::tls_handshake_failed:
+                return "TLS handshake failed";
+            case error::tls_failed_sni_hostname:
+                return "Failed to set TLS SNI hostname";
+            default:
+                return "Unknown";
+        }
+    }
+};
+
+inline lib::error_category const & get_socket_category() {
+    static socket_category instance;
+    return instance;
+}
+
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_socket_category());
+}
+
+/// Type of asio transport socket policy initialization handlers
+typedef lib::function<void(const lib::error_code&)> init_handler;
+
+} // namespace socket
+} // namespace asio
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_ASIO_SOCKET_BASE_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/asio/security/none.hpp b/vendor/websocketpp/websocketpp/transport/asio/security/none.hpp
new file mode 100644
index 0000000..0e68a65
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/asio/security/none.hpp
@@ -0,0 +1,370 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_SECURITY_NONE_HPP
+#define WEBSOCKETPP_TRANSPORT_SECURITY_NONE_HPP
+
+#include <websocketpp/uri.hpp>
+
+#include <websocketpp/transport/base/connection.hpp>
+#include <websocketpp/transport/asio/security/base.hpp>
+
+#include <websocketpp/common/asio.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <sstream>
+#include <string>
+
+namespace websocketpp {
+namespace transport {
+namespace asio {
+/// A socket policy for the asio transport that implements a plain, unencrypted
+/// socket
+namespace basic_socket {
+
+/// The signature of the socket init handler for this socket policy
+typedef lib::function<void(connection_hdl,lib::asio::ip::tcp::socket&)>
+    socket_init_handler;
+
+/// Basic Asio connection socket component
+/**
+ * transport::asio::basic_socket::connection implements a connection socket
+ * component using Asio ip::tcp::socket.
+ */
+class connection : public lib::enable_shared_from_this<connection> {
+public:
+    /// Type of this connection socket component
+    typedef connection type;
+    /// Type of a shared pointer to this connection socket component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// Type of a pointer to the Asio io_service being used
+    typedef lib::asio::io_service* io_service_ptr;
+    /// Type of a pointer to the Asio io_service strand being used
+    typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr;
+    /// Type of the ASIO socket being used
+    typedef lib::asio::ip::tcp::socket socket_type;
+    /// Type of a shared pointer to the socket being used.
+    typedef lib::shared_ptr<socket_type> socket_ptr;
+
+    explicit connection() : m_state(UNINITIALIZED) {
+        //std::cout << "transport::asio::basic_socket::connection constructor"
+        //          << std::endl;
+    }
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return shared_from_this();
+    }
+
+    /// Check whether or not this connection is secure
+    /**
+     * @return Whether or not this connection is secure
+     */
+    bool is_secure() const {
+        return false;
+    }
+
+    /// Set the socket initialization handler
+    /**
+     * The socket initialization handler is called after the socket object is
+     * created but before it is used. This gives the application a chance to
+     * set any Asio socket options it needs.
+     *
+     * @param h The new socket_init_handler
+     */
+    void set_socket_init_handler(socket_init_handler h) {
+        m_socket_init_handler = h;
+    }
+
+    /// Retrieve a pointer to the underlying socket
+    /**
+     * This is used internally. It can also be used to set socket options, etc
+     */
+    lib::asio::ip::tcp::socket & get_socket() {
+        return *m_socket;
+    }
+
+    /// Retrieve a pointer to the underlying socket
+    /**
+     * This is used internally.
+     */
+    lib::asio::ip::tcp::socket & get_next_layer() {
+        return *m_socket;
+    }
+
+    /// Retrieve a pointer to the underlying socket
+    /**
+     * This is used internally. It can also be used to set socket options, etc
+     */
+    lib::asio::ip::tcp::socket & get_raw_socket() {
+        return *m_socket;
+    }
+
+    /// Get the remote endpoint address
+    /**
+     * The iostream transport has no information about the ultimate remote
+     * endpoint. It will return the string "iostream transport". To indicate
+     * this.
+     *
+     * TODO: allow user settable remote endpoint addresses if this seems useful
+     *
+     * @return A string identifying the address of the remote endpoint
+     */
+    std::string get_remote_endpoint(lib::error_code & ec) const {
+        std::stringstream s;
+
+        lib::asio::error_code aec;
+        lib::asio::ip::tcp::endpoint ep = m_socket->remote_endpoint(aec);
+
+        if (aec) {
+            ec = error::make_error_code(error::pass_through);
+            s << "Error getting remote endpoint: " << aec
+               << " (" << aec.message() << ")";
+            return s.str();
+        } else {
+            ec = lib::error_code();
+            s << ep;
+            return s.str();
+        }
+    }
+protected:
+    /// Perform one time initializations
+    /**
+     * init_asio is called once immediately after construction to initialize
+     * Asio components to the io_service
+     *
+     * @param service A pointer to the endpoint's io_service
+     * @param strand A shared pointer to the connection's asio strand
+     * @param is_server Whether or not the endpoint is a server or not.
+     */
+    lib::error_code init_asio (io_service_ptr service, strand_ptr, bool)
+    {
+        if (m_state != UNINITIALIZED) {
+            return socket::make_error_code(socket::error::invalid_state);
+        }
+
+        m_socket = lib::make_shared<lib::asio::ip::tcp::socket>(
+            lib::ref(*service));
+
+        m_state = READY;
+
+        return lib::error_code();
+    }
+
+    /// Set uri hook
+    /**
+     * Called by the transport as a connection is being established to provide
+     * the uri being connected to to the security/socket layer.
+     *
+     * This socket policy doesn't use the uri so it is ignored.
+     *
+     * @since 0.6.0
+     *
+     * @param u The uri to set
+     */
+    void set_uri(uri_ptr) {}
+
+    /// Pre-initialize security policy
+    /**
+     * Called by the transport after a new connection is created to initialize
+     * the socket component of the connection. This method is not allowed to
+     * write any bytes to the wire. This initialization happens before any
+     * proxies or other intermediate wrappers are negotiated.
+     *
+     * @param callback Handler to call back with completion information
+     */
+    void pre_init(init_handler callback) {
+        if (m_state != READY) {
+            callback(socket::make_error_code(socket::error::invalid_state));
+            return;
+        }
+
+        if (m_socket_init_handler) {
+            m_socket_init_handler(m_hdl,*m_socket);
+        }
+
+        m_state = READING;
+
+        callback(lib::error_code());
+    }
+
+    /// Post-initialize security policy
+    /**
+     * Called by the transport after all intermediate proxies have been
+     * negotiated. This gives the security policy the chance to talk with the
+     * real remote endpoint for a bit before the websocket handshake.
+     *
+     * @param callback Handler to call back with completion information
+     */
+    void post_init(init_handler callback) {
+        callback(lib::error_code());
+    }
+
+    /// Sets the connection handle
+    /**
+     * The connection handle is passed to any handlers to identify the
+     * connection
+     *
+     * @param hdl The new handle
+     */
+    void set_handle(connection_hdl hdl) {
+        m_hdl = hdl;
+    }
+
+    /// Cancel all async operations on this socket
+    /**
+     * Attempts to cancel all async operations on this socket and reports any
+     * failures.
+     *
+     * NOTE: Windows XP and earlier do not support socket cancellation.
+     *
+     * @return The error that occurred, if any.
+     */
+    lib::asio::error_code cancel_socket() {
+        lib::asio::error_code ec;
+        m_socket->cancel(ec);
+        return ec;
+    }
+
+    void async_shutdown(socket::shutdown_handler h) {
+        lib::asio::error_code ec;
+        m_socket->shutdown(lib::asio::ip::tcp::socket::shutdown_both, ec);
+        h(ec);
+    }
+
+    lib::error_code get_ec() const {
+        return lib::error_code();
+    }
+
+    /// Translate any security policy specific information about an error code
+    /**
+     * Translate_ec takes an Asio error code and attempts to convert its value 
+     * to an appropriate websocketpp error code. In the case that the Asio and
+     * Websocketpp error types are the same (such as using boost::asio and
+     * boost::system_error or using standalone asio and std::system_error the
+     * code will be passed through natively.
+     *
+     * In the case of a mismatch (boost::asio with std::system_error) a
+     * translated code will be returned. The plain socket policy does not have 
+     * any additional information so all such errors will be reported as the
+     * generic transport pass_through error.
+     *
+     * @since 0.3.0
+     *
+     * @param ec The error code to translate_ec
+     * @return The translated error code
+     */
+    template <typename ErrorCodeType>
+    lib::error_code translate_ec(ErrorCodeType) {
+        // We don't know any more information about this error so pass through
+        return make_error_code(transport::error::pass_through);
+    }
+    
+    /// Overload of translate_ec to catch cases where lib::error_code is the 
+    /// same type as lib::asio::error_code
+    lib::error_code translate_ec(lib::error_code ec) {
+        // We don't know any more information about this error, but the error is
+        // the same type as the one we are translating to, so pass through
+        // untranslated.
+        return ec;
+    }
+private:
+    enum state {
+        UNINITIALIZED = 0,
+        READY = 1,
+        READING = 2
+    };
+
+    socket_ptr          m_socket;
+    state               m_state;
+
+    connection_hdl      m_hdl;
+    socket_init_handler m_socket_init_handler;
+};
+
+/// Basic ASIO endpoint socket component
+/**
+ * transport::asio::basic_socket::endpoint implements an endpoint socket
+ * component that uses Boost ASIO's ip::tcp::socket.
+ */
+class endpoint {
+public:
+    /// The type of this endpoint socket component
+    typedef endpoint type;
+
+    /// The type of the corresponding connection socket component
+    typedef connection socket_con_type;
+    /// The type of a shared pointer to the corresponding connection socket
+    /// component.
+    typedef socket_con_type::ptr socket_con_ptr;
+
+    explicit endpoint() {}
+
+    /// Checks whether the endpoint creates secure connections
+    /**
+     * @return Whether or not the endpoint creates secure connections
+     */
+    bool is_secure() const {
+        return false;
+    }
+
+    /// Set socket init handler
+    /**
+     * The socket init handler is called after a connection's socket is created
+     * but before it is used. This gives the end application an opportunity to
+     * set asio socket specific parameters.
+     *
+     * @param h The new socket_init_handler
+     */
+    void set_socket_init_handler(socket_init_handler h) {
+        m_socket_init_handler = h;
+    }
+protected:
+    /// Initialize a connection
+    /**
+     * Called by the transport after a new connection is created to initialize
+     * the socket component of the connection.
+     *
+     * @param scon Pointer to the socket component of the connection
+     *
+     * @return Error code (empty on success)
+     */
+    lib::error_code init(socket_con_ptr scon) {
+        scon->set_socket_init_handler(m_socket_init_handler);
+        return lib::error_code();
+    }
+private:
+    socket_init_handler m_socket_init_handler;
+};
+
+} // namespace basic_socket
+} // namespace asio
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_SECURITY_NONE_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/asio/security/tls.hpp b/vendor/websocketpp/websocketpp/transport/asio/security/tls.hpp
new file mode 100644
index 0000000..a8aafec
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/asio/security/tls.hpp
@@ -0,0 +1,480 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_SECURITY_TLS_HPP
+#define WEBSOCKETPP_TRANSPORT_SECURITY_TLS_HPP
+
+#include <websocketpp/transport/asio/security/base.hpp>
+
+#include <websocketpp/uri.hpp>
+
+#include <websocketpp/common/asio_ssl.hpp>
+#include <websocketpp/common/asio.hpp>
+#include <websocketpp/common/connection_hdl.hpp>
+#include <websocketpp/common/functional.hpp>
+#include <websocketpp/common/memory.hpp>
+
+#include <sstream>
+#include <string>
+
+namespace websocketpp {
+namespace transport {
+namespace asio {
+/// A socket policy for the asio transport that implements a TLS encrypted
+/// socket by wrapping with an asio::ssl::stream
+namespace tls_socket {
+
+/// The signature of the socket_init_handler for this socket policy
+typedef lib::function<void(connection_hdl,lib::asio::ssl::stream<
+    lib::asio::ip::tcp::socket>&)> socket_init_handler;
+/// The signature of the tls_init_handler for this socket policy
+typedef lib::function<lib::shared_ptr<lib::asio::ssl::context>(connection_hdl)>
+    tls_init_handler;
+
+/// TLS enabled Asio connection socket component
+/**
+ * transport::asio::tls_socket::connection implements a secure connection socket
+ * component that uses Asio's ssl::stream to wrap an ip::tcp::socket.
+ */
+class connection : public lib::enable_shared_from_this<connection> {
+public:
+    /// Type of this connection socket component
+    typedef connection type;
+    /// Type of a shared pointer to this connection socket component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// Type of the ASIO socket being used
+    typedef lib::asio::ssl::stream<lib::asio::ip::tcp::socket> socket_type;
+    /// Type of a shared pointer to the ASIO socket being used
+    typedef lib::shared_ptr<socket_type> socket_ptr;
+    /// Type of a pointer to the ASIO io_service being used
+    typedef lib::asio::io_service * io_service_ptr;
+    /// Type of a pointer to the ASIO io_service strand being used
+    typedef lib::shared_ptr<lib::asio::io_service::strand> strand_ptr;
+    /// Type of a shared pointer to the ASIO TLS context being used
+    typedef lib::shared_ptr<lib::asio::ssl::context> context_ptr;
+
+    explicit connection() {
+        //std::cout << "transport::asio::tls_socket::connection constructor"
+        //          << std::endl;
+    }
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return shared_from_this();
+    }
+
+    /// Check whether or not this connection is secure
+    /**
+     * @return Whether or not this connection is secure
+     */
+    bool is_secure() const {
+        return true;
+    }
+
+    /// Retrieve a pointer to the underlying socket
+    /**
+     * This is used internally. It can also be used to set socket options, etc
+     */
+    socket_type::lowest_layer_type & get_raw_socket() {
+        return m_socket->lowest_layer();
+    }
+
+    /// Retrieve a pointer to the layer below the ssl stream
+    /**
+     * This is used internally.
+     */
+    socket_type::next_layer_type & get_next_layer() {
+        return m_socket->next_layer();
+    }
+
+    /// Retrieve a pointer to the wrapped socket
+    /**
+     * This is used internally.
+     */
+    socket_type & get_socket() {
+        return *m_socket;
+    }
+
+    /// Set the socket initialization handler
+    /**
+     * The socket initialization handler is called after the socket object is
+     * created but before it is used. This gives the application a chance to
+     * set any ASIO socket options it needs.
+     *
+     * @param h The new socket_init_handler
+     */
+    void set_socket_init_handler(socket_init_handler h) {
+        m_socket_init_handler = h;
+    }
+
+    /// Set TLS init handler
+    /**
+     * The tls init handler is called when needed to request a TLS context for
+     * the library to use. A TLS init handler must be set and it must return a
+     * valid TLS context in order for this endpoint to be able to initialize
+     * TLS connections
+     *
+     * @param h The new tls_init_handler
+     */
+    void set_tls_init_handler(tls_init_handler h) {
+        m_tls_init_handler = h;
+    }
+
+    /// Get the remote endpoint address
+    /**
+     * The iostream transport has no information about the ultimate remote
+     * endpoint. It will return the string "iostream transport". To indicate
+     * this.
+     *
+     * TODO: allow user settable remote endpoint addresses if this seems useful
+     *
+     * @return A string identifying the address of the remote endpoint
+     */
+    std::string get_remote_endpoint(lib::error_code & ec) const {
+        std::stringstream s;
+
+        lib::asio::error_code aec;
+        lib::asio::ip::tcp::endpoint ep = m_socket->lowest_layer().remote_endpoint(aec);
+
+        if (aec) {
+            ec = error::make_error_code(error::pass_through);
+            s << "Error getting remote endpoint: " << aec
+               << " (" << aec.message() << ")";
+            return s.str();
+        } else {
+            ec = lib::error_code();
+            s << ep;
+            return s.str();
+        }
+    }
+protected:
+    /// Perform one time initializations
+    /**
+     * init_asio is called once immediately after construction to initialize
+     * Asio components to the io_service
+     *
+     * @param service A pointer to the endpoint's io_service
+     * @param strand A pointer to the connection's strand
+     * @param is_server Whether or not the endpoint is a server or not.
+     */
+    lib::error_code init_asio (io_service_ptr service, strand_ptr strand,
+        bool is_server)
+    {
+        if (!m_tls_init_handler) {
+            return socket::make_error_code(socket::error::missing_tls_init_handler);
+        }
+        m_context = m_tls_init_handler(m_hdl);
+
+        if (!m_context) {
+            return socket::make_error_code(socket::error::invalid_tls_context);
+        }
+        m_socket = lib::make_shared<socket_type>(
+            _WEBSOCKETPP_REF(*service),lib::ref(*m_context));
+
+        m_io_service = service;
+        m_strand = strand;
+        m_is_server = is_server;
+
+        return lib::error_code();
+    }
+
+    /// Set hostname hook
+    /**
+     * Called by the transport as a connection is being established to provide
+     * the hostname being connected to to the security/socket layer.
+     *
+     * This socket policy uses the hostname to set the appropriate TLS SNI
+     * header.
+     *
+     * @since 0.6.0
+     *
+     * @param u The uri to set
+     */
+    void set_uri(uri_ptr u) {
+        m_uri = u;
+    }
+
+    /// Pre-initialize security policy
+    /**
+     * Called by the transport after a new connection is created to initialize
+     * the socket component of the connection. This method is not allowed to
+     * write any bytes to the wire. This initialization happens before any
+     * proxies or other intermediate wrappers are negotiated.
+     *
+     * @param callback Handler to call back with completion information
+     */
+    void pre_init(init_handler callback) {
+        // TODO: is this the best way to check whether this function is 
+        //       available in the version of OpenSSL being used?
+        // TODO: consider case where host is an IP address
+#if OPENSSL_VERSION_NUMBER >= 0x90812f
+        if (!m_is_server) {
+            // For clients on systems with a suitable OpenSSL version, set the
+            // TLS SNI hostname header so connecting to TLS servers using SNI
+            // will work.
+            long res = SSL_set_tlsext_host_name(
+                get_socket().native_handle(), m_uri->get_host().c_str());
+            if (!(1 == res)) {
+                callback(socket::make_error_code(socket::error::tls_failed_sni_hostname));
+            }
+        }
+#endif
+
+        if (m_socket_init_handler) {
+            m_socket_init_handler(m_hdl,get_socket());
+        }
+
+        callback(lib::error_code());
+    }
+
+    /// Post-initialize security policy
+    /**
+     * Called by the transport after all intermediate proxies have been
+     * negotiated. This gives the security policy the chance to talk with the
+     * real remote endpoint for a bit before the websocket handshake.
+     *
+     * @param callback Handler to call back with completion information
+     */
+    void post_init(init_handler callback) {
+        m_ec = socket::make_error_code(socket::error::tls_handshake_timeout);
+
+        // TLS handshake
+        if (m_strand) {
+            m_socket->async_handshake(
+                get_handshake_type(),
+                m_strand->wrap(lib::bind(
+                    &type::handle_init, get_shared(),
+                    callback,
+                    lib::placeholders::_1
+                ))
+            );
+        } else {
+            m_socket->async_handshake(
+                get_handshake_type(),
+                lib::bind(
+                    &type::handle_init, get_shared(),
+                    callback,
+                    lib::placeholders::_1
+                )
+            );
+        }
+    }
+
+    /// Sets the connection handle
+    /**
+     * The connection handle is passed to any handlers to identify the
+     * connection
+     *
+     * @param hdl The new handle
+     */
+    void set_handle(connection_hdl hdl) {
+        m_hdl = hdl;
+    }
+
+    void handle_init(init_handler callback,lib::asio::error_code const & ec) {
+        if (ec) {
+            m_ec = socket::make_error_code(socket::error::tls_handshake_failed);
+        } else {
+            m_ec = lib::error_code();
+        }
+
+        callback(m_ec);
+    }
+
+    lib::error_code get_ec() const {
+        return m_ec;
+    }
+
+    /// Cancel all async operations on this socket
+    /**
+     * Attempts to cancel all async operations on this socket and reports any
+     * failures.
+     *
+     * NOTE: Windows XP and earlier do not support socket cancellation.
+     *
+     * @return The error that occurred, if any.
+     */
+    lib::asio::error_code cancel_socket() {
+        lib::asio::error_code ec;
+        get_raw_socket().cancel(ec);
+        return ec;
+    }
+
+    void async_shutdown(socket::shutdown_handler callback) {
+        if (m_strand) {
+            m_socket->async_shutdown(m_strand->wrap(callback));
+        } else {
+            m_socket->async_shutdown(callback);
+        }
+    }
+
+    /// Translate any security policy specific information about an error code
+    /**
+     * Translate_ec takes an Asio error code and attempts to convert its value
+     * to an appropriate websocketpp error code. In the case that the Asio and
+     * Websocketpp error types are the same (such as using boost::asio and
+     * boost::system_error or using standalone asio and std::system_error the
+     * code will be passed through natively.
+     *
+     * In the case of a mismatch (boost::asio with std::system_error) a
+     * translated code will be returned. Any error that is determined to be
+     * related to TLS but does not have a more specific websocketpp error code
+     * is returned under the catch all error `tls_error`. Non-TLS related errors
+     * are returned as the transport generic error `pass_through`
+     *
+     * @since 0.3.0
+     *
+     * @param ec The error code to translate_ec
+     * @return The translated error code
+     */
+    template <typename ErrorCodeType>
+    lib::error_code translate_ec(ErrorCodeType ec) {
+        if (ec.category() == lib::asio::error::get_ssl_category()) {
+                // We know it is a TLS related error, but otherwise don't know
+                // more. Pass through as TLS generic.
+                return make_error_code(transport::error::tls_error);
+        } else {
+            // We don't know any more information about this error so pass
+            // through
+            return make_error_code(transport::error::pass_through);
+        }
+    }
+    
+    /// Overload of translate_ec to catch cases where lib::error_code is the
+    /// same type as lib::asio::error_code
+    lib::error_code translate_ec(lib::error_code ec) {
+        // Normalize the tls_short_read error as it is used by the library and 
+        // needs a consistent value. All other errors pass through natively.
+        // TODO: how to get the SSL category from std::error?
+        /*if (ec.category() == lib::asio::error::get_ssl_category()) {
+            if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) {
+                return make_error_code(transport::error::tls_short_read);
+            }
+        }*/
+        return ec;
+    }
+private:
+    socket_type::handshake_type get_handshake_type() {
+        if (m_is_server) {
+            return lib::asio::ssl::stream_base::server;
+        } else {
+            return lib::asio::ssl::stream_base::client;
+        }
+    }
+
+    io_service_ptr      m_io_service;
+    strand_ptr          m_strand;
+    context_ptr         m_context;
+    socket_ptr          m_socket;
+    uri_ptr             m_uri;
+    bool                m_is_server;
+
+    lib::error_code     m_ec;
+
+    connection_hdl      m_hdl;
+    socket_init_handler m_socket_init_handler;
+    tls_init_handler    m_tls_init_handler;
+};
+
+/// TLS enabled Asio endpoint socket component
+/**
+ * transport::asio::tls_socket::endpoint implements a secure endpoint socket
+ * component that uses Asio's ssl::stream to wrap an ip::tcp::socket.
+ */
+class endpoint {
+public:
+    /// The type of this endpoint socket component
+    typedef endpoint type;
+
+    /// The type of the corresponding connection socket component
+    typedef connection socket_con_type;
+    /// The type of a shared pointer to the corresponding connection socket
+    /// component.
+    typedef socket_con_type::ptr socket_con_ptr;
+
+    explicit endpoint() {}
+
+    /// Checks whether the endpoint creates secure connections
+    /**
+     * @return Whether or not the endpoint creates secure connections
+     */
+    bool is_secure() const {
+        return true;
+    }
+
+    /// Set socket init handler
+    /**
+     * The socket init handler is called after a connection's socket is created
+     * but before it is used. This gives the end application an opportunity to
+     * set asio socket specific parameters.
+     *
+     * @param h The new socket_init_handler
+     */
+    void set_socket_init_handler(socket_init_handler h) {
+        m_socket_init_handler = h;
+    }
+
+    /// Set TLS init handler
+    /**
+     * The tls init handler is called when needed to request a TLS context for
+     * the library to use. A TLS init handler must be set and it must return a
+     * valid TLS context in order for this endpoint to be able to initialize
+     * TLS connections
+     *
+     * @param h The new tls_init_handler
+     */
+    void set_tls_init_handler(tls_init_handler h) {
+        m_tls_init_handler = h;
+    }
+protected:
+    /// Initialize a connection
+    /**
+     * Called by the transport after a new connection is created to initialize
+     * the socket component of the connection.
+     *
+     * @param scon Pointer to the socket component of the connection
+     *
+     * @return Error code (empty on success)
+     */
+    lib::error_code init(socket_con_ptr scon) {
+        scon->set_socket_init_handler(m_socket_init_handler);
+        scon->set_tls_init_handler(m_tls_init_handler);
+        return lib::error_code();
+    }
+
+private:
+    socket_init_handler m_socket_init_handler;
+    tls_init_handler m_tls_init_handler;
+};
+
+} // namespace tls_socket
+} // namespace asio
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_SECURITY_TLS_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/base/connection.hpp b/vendor/websocketpp/websocketpp/transport/base/connection.hpp
new file mode 100644
index 0000000..f76d409
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/base/connection.hpp
@@ -0,0 +1,238 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_BASE_CON_HPP
+#define WEBSOCKETPP_TRANSPORT_BASE_CON_HPP
+
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/connection_hdl.hpp>
+#include <websocketpp/common/functional.hpp>
+#include <websocketpp/common/system_error.hpp>
+
+#include <string>
+
+namespace websocketpp {
+/// Transport policies provide network connectivity and timers
+/**
+ * ### Connection Interface
+ *
+ * Transport connection components needs to provide:
+ *
+ * **init**\n
+ * `void init(init_handler handler)`\n
+ * Called once shortly after construction to give the policy the chance to
+ * perform one time initialization. When complete, the policy must call the
+ * supplied `init_handler` to continue setup. The handler takes one argument
+ * with the error code if any. If an error is returned here setup will fail and
+ * the connection will be aborted or terminated.
+ *
+ * WebSocket++ will call init only once. The transport must call `handler`
+ * exactly once.
+ *
+ * **async_read_at_least**\n
+ * `void async_read_at_least(size_t num_bytes, char *buf, size_t len,
+ * read_handler handler)`\n
+ * start an async read for at least num_bytes and at most len
+ * bytes into buf. Call handler when done with number of bytes read.
+ *
+ * WebSocket++ promises to have only one async_read_at_least in flight at a
+ * time. The transport must promise to only call read_handler once per async
+ * read.
+ *
+ * **async_write**\n
+ * `void async_write(const char* buf, size_t len, write_handler handler)`\n
+ * `void async_write(std::vector<buffer> & bufs, write_handler handler)`\n
+ * Start a write of all of the data in buf or bufs. In second case data is
+ * written sequentially and in place without copying anything to a temporary
+ * location.
+ *
+ * Websocket++ promises to have only one async_write in flight at a time.
+ * The transport must promise to only call the write_handler once per async
+ * write
+ *
+ * **set_handle**\n
+ * `void set_handle(connection_hdl hdl)`\n
+ * Called by WebSocket++ to let this policy know the hdl to the connection. It
+ * may be stored for later use or ignored/discarded. This handle should be used
+ * if the policy adds any connection handlers. Connection handlers must be
+ * called with the handle as the first argument so that the handler code knows
+ * which connection generated the callback.
+ *
+ * **set_timer**\n
+ * `timer_ptr set_timer(long duration, timer_handler handler)`\n
+ * WebSocket++ uses the timers provided by the transport policy as the
+ * implementation of timers is often highly coupled with the implementation of
+ * the networking event loops.
+ *
+ * Transport timer support is an optional feature. A transport method may elect
+ * to implement a dummy timer object and have this method return an empty
+ * pointer. If so, all timer related features of WebSocket++ core will be
+ * disabled. This includes many security features designed to prevent denial of
+ * service attacks. Use timer-free transport policies with caution.
+ *
+ * **get_remote_endpoint**\n
+ * `std::string get_remote_endpoint()`\n
+ * retrieve address of remote endpoint
+ *
+ * **is_secure**\n
+ * `void is_secure()`\n
+ * whether or not the connection to the remote endpoint is secure
+ *
+ * **dispatch**\n
+ * `lib::error_code dispatch(dispatch_handler handler)`: invoke handler within
+ * the transport's event system if it uses one. Otherwise, this method should
+ * simply call `handler` immediately.
+ *
+ * **async_shutdown**\n
+ * `void async_shutdown(shutdown_handler handler)`\n
+ * Perform any cleanup necessary (if any). Call `handler` when complete.
+ */
+namespace transport {
+
+/// The type and signature of the callback passed to the init hook
+typedef lib::function<void(lib::error_code const &)> init_handler;
+
+/// The type and signature of the callback passed to the read method
+typedef lib::function<void(lib::error_code const &,size_t)> read_handler;
+
+/// The type and signature of the callback passed to the write method
+typedef lib::function<void(lib::error_code const &)> write_handler;
+
+/// The type and signature of the callback passed to the read method
+typedef lib::function<void(lib::error_code const &)> timer_handler;
+
+/// The type and signature of the callback passed to the shutdown method
+typedef lib::function<void(lib::error_code const &)> shutdown_handler;
+
+/// The type and signature of the callback passed to the interrupt method
+typedef lib::function<void()> interrupt_handler;
+
+/// The type and signature of the callback passed to the dispatch method
+typedef lib::function<void()> dispatch_handler;
+
+/// A simple utility buffer class
+struct buffer {
+    buffer(char const * b, size_t l) : buf(b),len(l) {}
+
+    char const * buf;
+    size_t len;
+};
+
+/// Generic transport related errors
+namespace error {
+enum value {
+    /// Catch-all error for transport policy errors that don't fit in other
+    /// categories
+    general = 1,
+
+    /// underlying transport pass through
+    pass_through,
+
+    /// async_read_at_least call requested more bytes than buffer can store
+    invalid_num_bytes,
+
+    /// async_read called while another async_read was in progress
+    double_read,
+
+    /// Operation aborted
+    operation_aborted,
+
+    /// Operation not supported
+    operation_not_supported,
+
+    /// End of file
+    eof,
+
+    /// TLS short read
+    tls_short_read,
+
+    /// Timer expired
+    timeout,
+
+    /// read or write after shutdown
+    action_after_shutdown,
+
+    /// Other TLS error
+    tls_error
+};
+
+class category : public lib::error_category {
+    public:
+    category() {}
+
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.transport";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case general:
+                return "Generic transport policy error";
+            case pass_through:
+                return "Underlying Transport Error";
+            case invalid_num_bytes:
+                return "async_read_at_least call requested more bytes than buffer can store";
+            case operation_aborted:
+                return "The operation was aborted";
+            case operation_not_supported:
+                return "The operation is not supported by this transport";
+            case eof:
+                return "End of File";
+            case tls_short_read:
+                return "TLS Short Read";
+            case timeout:
+                return "Timer Expired";
+            case action_after_shutdown:
+                return "A transport action was requested after shutdown";
+            case tls_error:
+                return "Generic TLS related error";
+            default:
+                return "Unknown";
+        }
+    }
+};
+
+inline lib::error_category const & get_category() {
+    static category instance;
+    return instance;
+}
+
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_category());
+}
+
+} // namespace error
+} // namespace transport
+} // namespace websocketpp
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum<websocketpp::transport::error::value>
+{
+    static bool const value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+
+#endif // WEBSOCKETPP_TRANSPORT_BASE_CON_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/base/endpoint.hpp b/vendor/websocketpp/websocketpp/transport/base/endpoint.hpp
new file mode 100644
index 0000000..3b4b0d6
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/base/endpoint.hpp
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_BASE_HPP
+#define WEBSOCKETPP_TRANSPORT_BASE_HPP
+
+#include <websocketpp/common/functional.hpp>
+#include <websocketpp/common/system_error.hpp>
+
+namespace websocketpp {
+/// Transport policies provide network connectivity and timers
+/**
+ * ### Endpoint Interface
+ *
+ * Transport endpoint components needs to provide:
+ *
+ * **init**\n
+ * `lib::error_code init(transport_con_ptr tcon)`\n
+ * init is called by an endpoint once for each newly created connection.
+ * It's purpose is to give the transport policy the chance to perform any
+ * transport specific initialization that couldn't be done via the default
+ * constructor.
+ *
+ * **is_secure**\n
+ * `bool is_secure() const`\n
+ * Test whether the transport component of this endpoint is capable of secure
+ * connections.
+ *
+ * **async_connect**\n
+ * `void async_connect(transport_con_ptr tcon, uri_ptr location,
+ *  connect_handler handler)`\n
+ * Initiate a connection to `location` using the given connection `tcon`. `tcon`
+ * is a pointer to the transport connection component of the connection. When
+ * complete, `handler` should be called with the the connection's
+ * `connection_hdl` and any error that occurred.
+ *
+ * **init_logging**
+ * `void init_logging(alog_type * a, elog_type * e)`\n
+ * Called once after construction to provide pointers to the endpoint's access
+ * and error loggers. These may be stored and used to log messages or ignored.
+ */
+namespace transport {
+
+/// The type and signature of the callback passed to the accept method
+typedef lib::function<void(lib::error_code const &)> accept_handler;
+
+/// The type and signature of the callback passed to the connect method
+typedef lib::function<void(lib::error_code const &)> connect_handler;
+
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_BASE_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/debug/base.hpp b/vendor/websocketpp/websocketpp/transport/debug/base.hpp
new file mode 100644
index 0000000..2e477b5
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/debug/base.hpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_DEBUG_BASE_HPP
+#define WEBSOCKETPP_TRANSPORT_DEBUG_BASE_HPP
+
+#include <websocketpp/common/system_error.hpp>
+#include <websocketpp/common/cpp11.hpp>
+
+#include <string>
+
+namespace websocketpp {
+namespace transport {
+/// Debug transport policy that is used for various mocking and stubbing duties
+/// in unit tests.
+namespace debug {
+
+/// debug transport errors
+namespace error {
+enum value {
+    /// Catch-all error for transport policy errors that don't fit in other
+    /// categories
+    general = 1,
+
+    /// not implemented
+    not_implemented,
+    
+    invalid_num_bytes,
+    
+    double_read
+};
+
+/// debug transport error category
+class category : public lib::error_category {
+    public:
+    category() {}
+
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.transport.debug";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case general:
+                return "Generic stub transport policy error";
+            case not_implemented:
+                return "feature not implemented";
+            case invalid_num_bytes:
+                return "Invalid number of bytes";
+            case double_read:
+                return "Read while another read was outstanding";
+            default:
+                return "Unknown";
+        }
+    }
+};
+
+/// Get a reference to a static copy of the debug transport error category
+inline lib::error_category const & get_category() {
+    static category instance;
+    return instance;
+}
+
+/// Get an error code with the given value and the debug transport category
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_category());
+}
+
+} // namespace error
+} // namespace debug
+} // namespace transport
+} // namespace websocketpp
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum<websocketpp::transport::debug::error::value>
+{
+    static bool const value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+
+#endif // WEBSOCKETPP_TRANSPORT_DEBUG_BASE_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/debug/connection.hpp b/vendor/websocketpp/websocketpp/transport/debug/connection.hpp
new file mode 100644
index 0000000..36b282a
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/debug/connection.hpp
@@ -0,0 +1,412 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_DEBUG_CON_HPP
+#define WEBSOCKETPP_TRANSPORT_DEBUG_CON_HPP
+
+#include <websocketpp/transport/debug/base.hpp>
+
+#include <websocketpp/transport/base/connection.hpp>
+
+#include <websocketpp/uri.hpp>
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/connection_hdl.hpp>
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/common/platforms.hpp>
+
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace transport {
+namespace debug {
+
+/// Empty timer class to stub out for timer functionality that stub
+/// transport doesn't support
+struct timer {
+    void cancel() {}
+};
+
+template <typename config>
+class connection : public lib::enable_shared_from_this< connection<config> > {
+public:
+    /// Type of this connection transport component
+    typedef connection<config> type;
+    /// Type of a shared pointer to this connection transport component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// transport concurrency policy
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of this transport's access logging policy
+    typedef typename config::alog_type alog_type;
+    /// Type of this transport's error logging policy
+    typedef typename config::elog_type elog_type;
+
+    // Concurrency policy types
+    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
+    typedef typename concurrency_type::mutex_type mutex_type;
+
+    typedef lib::shared_ptr<timer> timer_ptr;
+
+    explicit connection(bool is_server, alog_type & alog, elog_type & elog)
+      : m_reading(false), m_is_server(is_server), m_alog(alog), m_elog(elog)
+    {
+        m_alog.write(log::alevel::devel,"debug con transport constructor");
+    }
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return type::shared_from_this();
+    }
+
+    /// Set whether or not this connection is secure
+    /**
+     * Todo: docs
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value Whether or not this connection is secure.
+     */
+    void set_secure(bool) {}
+
+    /// Tests whether or not the underlying transport is secure
+    /**
+     * TODO: docs
+     *
+     * @return Whether or not the underlying transport is secure
+     */
+    bool is_secure() const {
+        return false;
+    }
+
+    /// Set uri hook
+    /**
+     * Called by the endpoint as a connection is being established to provide
+     * the uri being connected to to the transport layer.
+     *
+     * Implementation is optional and can be ignored if the transport has no
+     * need for this information.
+     *
+     * @since 0.6.0
+     *
+     * @param u The uri to set
+     */
+    void set_uri(uri_ptr) {}
+
+    /// Set human readable remote endpoint address
+    /**
+     * Sets the remote endpoint address returned by `get_remote_endpoint`. This
+     * value should be a human readable string that describes the remote
+     * endpoint. Typically an IP address or hostname, perhaps with a port. But
+     * may be something else depending on the nature of the underlying
+     * transport.
+     *
+     * If none is set a default is returned.
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value The remote endpoint address to set.
+     */
+    void set_remote_endpoint(std::string) {}
+
+    /// Get human readable remote endpoint address
+    /**
+     * TODO: docs
+     *
+     * This value is used in access and error logs and is available to the end
+     * application for including in user facing interfaces and messages.
+     *
+     * @return A string identifying the address of the remote endpoint
+     */
+    std::string get_remote_endpoint() const {
+        return "unknown (debug transport)";
+    }
+
+    /// Get the connection handle
+    /**
+     * @return The handle for this connection.
+     */
+    connection_hdl get_handle() const {
+        return connection_hdl();
+    }
+
+    /// Call back a function after a period of time.
+    /**
+     * Timers are not implemented in this transport. The timer pointer will
+     * always be empty. The handler will never be called.
+     *
+     * @param duration Length of time to wait in milliseconds
+     * @param callback The function to call back when the timer has expired
+     * @return A handle that can be used to cancel the timer if it is no longer
+     * needed.
+     */
+    timer_ptr set_timer(long, timer_handler handler) {
+        m_alog.write(log::alevel::devel,"debug connection set timer");
+        m_timer_handler = handler;
+        return timer_ptr();
+    }
+    
+    /// Manual input supply (read all)
+    /**
+     * Similar to read_some, but continues to read until all bytes in the
+     * supplied buffer have been read or the connection runs out of read
+     * requests.
+     *
+     * This method still may not read all of the bytes in the input buffer. if
+     * it doesn't it indicates that the connection was most likely closed or
+     * is in an error state where it is no longer accepting new input.
+     *
+     * @since 0.3.0
+     *
+     * @param buf Char buffer to read into the websocket
+     * @param len Length of buf
+     * @return The number of characters from buf actually read.
+     */
+    size_t read_all(char const * buf, size_t len) {        
+        size_t total_read = 0;
+        size_t temp_read = 0;
+
+        do {
+            temp_read = this->read_some_impl(buf+total_read,len-total_read);
+            total_read += temp_read;
+        } while (temp_read != 0 && total_read < len);
+
+        return total_read;
+    }
+    
+    // debug stuff to invoke the async handlers
+    void expire_timer(lib::error_code const & ec) {
+        m_timer_handler(ec);
+    }
+    
+    void fullfil_write() {
+        m_write_handler(lib::error_code());
+    }
+protected:
+    /// Initialize the connection transport
+    /**
+     * Initialize the connection's transport component.
+     *
+     * @param handler The `init_handler` to call when initialization is done
+     */
+    void init(init_handler handler) {
+        m_alog.write(log::alevel::devel,"debug connection init");
+        handler(lib::error_code());
+    }
+
+    /// Initiate an async_read for at least num_bytes bytes into buf
+    /**
+     * Initiates an async_read request for at least num_bytes bytes. The input
+     * will be read into buf. A maximum of len bytes will be input. When the
+     * operation is complete, handler will be called with the status and number
+     * of bytes read.
+     *
+     * This method may or may not call handler from within the initial call. The
+     * application should be prepared to accept either.
+     *
+     * The application should never call this method a second time before it has
+     * been called back for the first read. If this is done, the second read
+     * will be called back immediately with a double_read error.
+     *
+     * If num_bytes or len are zero handler will be called back immediately
+     * indicating success.
+     *
+     * @param num_bytes Don't call handler until at least this many bytes have
+     * been read.
+     * @param buf The buffer to read bytes into
+     * @param len The size of buf. At maximum, this many bytes will be read.
+     * @param handler The callback to invoke when the operation is complete or
+     * ends in an error
+     */
+    void async_read_at_least(size_t num_bytes, char * buf, size_t len,
+        read_handler handler)
+    {
+        std::stringstream s;
+        s << "debug_con async_read_at_least: " << num_bytes;
+        m_alog.write(log::alevel::devel,s.str());
+
+        if (num_bytes > len) {
+            handler(make_error_code(error::invalid_num_bytes),size_t(0));
+            return;
+        }
+
+        if (m_reading == true) {
+            handler(make_error_code(error::double_read),size_t(0));
+            return;
+        }
+
+        if (num_bytes == 0 || len == 0) {
+            handler(lib::error_code(),size_t(0));
+            return;
+        }
+
+        m_buf = buf;
+        m_len = len;
+        m_bytes_needed = num_bytes;
+        m_read_handler = handler;
+        m_cursor = 0;
+        m_reading = true;
+    }
+
+    /// Asyncronous Transport Write
+    /**
+     * Write len bytes in buf to the output stream. Call handler to report
+     * success or failure. handler may or may not be called during async_write,
+     * but it must be safe for this to happen.
+     *
+     * Will return 0 on success.
+     *
+     * @param buf buffer to read bytes from
+     * @param len number of bytes to write
+     * @param handler Callback to invoke with operation status.
+     */
+    void async_write(char const *, size_t, write_handler handler) {
+        m_alog.write(log::alevel::devel,"debug_con async_write");
+        m_write_handler = handler;
+    }
+
+    /// Asyncronous Transport Write (scatter-gather)
+    /**
+     * Write a sequence of buffers to the output stream. Call handler to report
+     * success or failure. handler may or may not be called during async_write,
+     * but it must be safe for this to happen.
+     *
+     * Will return 0 on success.
+     *
+     * @param bufs vector of buffers to write
+     * @param handler Callback to invoke with operation status.
+     */
+    void async_write(std::vector<buffer> const &, write_handler handler) {
+        m_alog.write(log::alevel::devel,"debug_con async_write buffer list");
+        m_write_handler = handler;
+    }
+
+    /// Set Connection Handle
+    /**
+     * @param hdl The new handle
+     */
+    void set_handle(connection_hdl) {}
+
+    /// Call given handler back within the transport's event system (if present)
+    /**
+     * Invoke a callback within the transport's event system if it has one. If
+     * it doesn't, the handler will be invoked immediately before this function
+     * returns.
+     *
+     * @param handler The callback to invoke
+     *
+     * @return Whether or not the transport was able to register the handler for
+     * callback.
+     */
+    lib::error_code dispatch(dispatch_handler handler) {
+        handler();
+        return lib::error_code();
+    }
+
+    /// Perform cleanup on socket shutdown_handler
+    /**
+     * @param h The `shutdown_handler` to call back when complete
+     */
+    void async_shutdown(shutdown_handler handler) {
+        handler(lib::error_code());
+    }
+    
+    size_t read_some_impl(char const * buf, size_t len) {
+        m_alog.write(log::alevel::devel,"debug_con read_some");
+
+        if (!m_reading) {
+            m_elog.write(log::elevel::devel,"write while not reading");
+            return 0;
+        }
+
+        size_t bytes_to_copy = (std::min)(len,m_len-m_cursor);
+
+        std::copy(buf,buf+bytes_to_copy,m_buf+m_cursor);
+
+        m_cursor += bytes_to_copy;
+
+        if (m_cursor >= m_bytes_needed) {
+            complete_read(lib::error_code());
+        }
+
+        return bytes_to_copy;
+    }
+
+    /// Signal that a requested read is complete
+    /**
+     * Sets the reading flag to false and returns the handler that should be
+     * called back with the result of the read. The cursor position that is sent
+     * is whatever the value of m_cursor is.
+     *
+     * It MUST NOT be called when m_reading is false.
+     * it MUST be called while holding the read lock
+     *
+     * It is important to use this method rather than directly setting/calling
+     * m_read_handler back because this function makes sure to delete the
+     * locally stored handler which contains shared pointers that will otherwise
+     * cause circular reference based memory leaks.
+     *
+     * @param ec The error code to forward to the read handler
+     */
+    void complete_read(lib::error_code const & ec) {
+        m_reading = false;
+
+        read_handler handler = m_read_handler;
+        m_read_handler = read_handler();
+
+        handler(ec,m_cursor);
+    }
+private:
+    timer_handler m_timer_handler;
+    
+    // Read space (Protected by m_read_mutex)
+    char *          m_buf;
+    size_t          m_len;
+    size_t          m_bytes_needed;
+    read_handler    m_read_handler;
+    size_t          m_cursor;
+
+    // transport resources
+    connection_hdl  m_connection_hdl;
+    write_handler   m_write_handler;
+    shutdown_handler    m_shutdown_handler;
+
+    bool            m_reading;
+    bool const      m_is_server;
+    bool            m_is_secure;
+    alog_type &     m_alog;
+    elog_type &     m_elog;
+    std::string     m_remote_endpoint;
+};
+
+
+} // namespace debug
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_DEBUG_CON_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/debug/endpoint.hpp b/vendor/websocketpp/websocketpp/transport/debug/endpoint.hpp
new file mode 100644
index 0000000..1cca70c
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/debug/endpoint.hpp
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_DEBUG_HPP
+#define WEBSOCKETPP_TRANSPORT_DEBUG_HPP
+
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/transport/base/endpoint.hpp>
+#include <websocketpp/transport/debug/connection.hpp>
+
+namespace websocketpp {
+namespace transport {
+namespace debug {
+
+template <typename config>
+class endpoint {
+public:
+    /// Type of this endpoint transport component
+    typedef endpoint type;
+    /// Type of a pointer to this endpoint transport component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// Type of this endpoint's concurrency policy
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of this endpoint's error logging policy
+    typedef typename config::elog_type elog_type;
+    /// Type of this endpoint's access logging policy
+    typedef typename config::alog_type alog_type;
+
+    /// Type of this endpoint transport component's associated connection
+    /// transport component.
+    typedef debug::connection<config> transport_con_type;
+    /// Type of a shared pointer to this endpoint transport component's
+    /// associated connection transport component
+    typedef typename transport_con_type::ptr transport_con_ptr;
+
+    // generate and manage our own io_service
+    explicit endpoint()
+    {
+        //std::cout << "transport::iostream::endpoint constructor" << std::endl;
+    }
+
+    /// Set whether or not endpoint can create secure connections
+    /**
+     * TODO: docs
+     *
+     * Setting this value only indicates whether or not the endpoint is capable
+     * of producing and managing secure connections. Connections produced by
+     * this endpoint must also be individually flagged as secure if they are.
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value Whether or not the endpoint can create secure connections.
+     */
+    void set_secure(bool) {}
+
+    /// Tests whether or not the underlying transport is secure
+    /**
+     * TODO: docs
+     *
+     * @return Whether or not the underlying transport is secure
+     */
+    bool is_secure() const {
+        return false;
+    }
+protected:
+    /// Initialize logging
+    /**
+     * The loggers are located in the main endpoint class. As such, the
+     * transport doesn't have direct access to them. This method is called
+     * by the endpoint constructor to allow shared logging from the transport
+     * component. These are raw pointers to member variables of the endpoint.
+     * In particular, they cannot be used in the transport constructor as they
+     * haven't been constructed yet, and cannot be used in the transport
+     * destructor as they will have been destroyed by then.
+     *
+     * @param a A pointer to the access logger to use.
+     * @param e A pointer to the error logger to use.
+     */
+    void init_logging(alog_type *, elog_type *) {}
+
+    /// Initiate a new connection
+    /**
+     * @param tcon A pointer to the transport connection component of the
+     * connection to connect.
+     * @param u A URI pointer to the URI to connect to.
+     * @param cb The function to call back with the results when complete.
+     */
+    void async_connect(transport_con_ptr, uri_ptr, connect_handler cb) {
+        cb(lib::error_code());
+    }
+
+    /// Initialize a connection
+    /**
+     * Init is called by an endpoint once for each newly created connection.
+     * It's purpose is to give the transport policy the chance to perform any
+     * transport specific initialization that couldn't be done via the default
+     * constructor.
+     *
+     * @param tcon A pointer to the transport portion of the connection.
+     * @return A status code indicating the success or failure of the operation
+     */
+    lib::error_code init(transport_con_ptr) {
+        return lib::error_code();
+    }
+private:
+
+};
+
+} // namespace debug
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_DEBUG_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/iostream/base.hpp b/vendor/websocketpp/websocketpp/transport/iostream/base.hpp
new file mode 100644
index 0000000..f878398
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/iostream/base.hpp
@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_BASE_HPP
+#define WEBSOCKETPP_TRANSPORT_IOSTREAM_BASE_HPP
+
+#include <websocketpp/common/system_error.hpp>
+#include <websocketpp/common/cpp11.hpp>
+#include <websocketpp/common/functional.hpp>
+#include <websocketpp/common/connection_hdl.hpp>
+
+#include <websocketpp/transport/base/connection.hpp>
+
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace transport {
+/// Transport policy that uses STL iostream for I/O and does not support timers
+namespace iostream {
+
+/// The type and signature of the callback used by iostream transport to write
+typedef lib::function<lib::error_code(connection_hdl, char const *, size_t)>
+    write_handler;
+
+/// The type and signature of the callback used by iostream transport to perform
+/// vectored writes.
+/**
+ * If a vectored write handler is not set the standard write handler will be
+ * called multiple times.
+ */
+typedef lib::function<lib::error_code(connection_hdl, std::vector<transport::buffer> const
+    & bufs)> vector_write_handler;
+
+/// The type and signature of the callback used by iostream transport to signal
+/// a transport shutdown.
+typedef lib::function<lib::error_code(connection_hdl)> shutdown_handler;
+
+/// iostream transport errors
+namespace error {
+enum value {
+    /// Catch-all error for transport policy errors that don't fit in other
+    /// categories
+    general = 1,
+
+    /// async_read_at_least call requested more bytes than buffer can store
+    invalid_num_bytes,
+
+    /// async_read called while another async_read was in progress
+    double_read,
+
+    /// An operation that requires an output stream was attempted before
+    /// setting one.
+    output_stream_required,
+
+    /// stream error
+    bad_stream
+};
+
+/// iostream transport error category
+class category : public lib::error_category {
+    public:
+    category() {}
+
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.transport.iostream";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case general:
+                return "Generic iostream transport policy error";
+            case invalid_num_bytes:
+                return "async_read_at_least call requested more bytes than buffer can store";
+            case double_read:
+                return "Async read already in progress";
+            case output_stream_required:
+                return "An output stream to be set before async_write can be used";
+            case bad_stream:
+                return "A stream operation returned ios::bad";
+            default:
+                return "Unknown";
+        }
+    }
+};
+
+/// Get a reference to a static copy of the iostream transport error category
+inline lib::error_category const & get_category() {
+    static category instance;
+    return instance;
+}
+
+/// Get an error code with the given value and the iostream transport category
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_category());
+}
+
+} // namespace error
+} // namespace iostream
+} // namespace transport
+} // namespace websocketpp
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum<websocketpp::transport::iostream::error::value>
+{
+    static bool const value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+
+#endif // WEBSOCKETPP_TRANSPORT_IOSTREAM_BASE_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/iostream/connection.hpp b/vendor/websocketpp/websocketpp/transport/iostream/connection.hpp
new file mode 100644
index 0000000..81c4f41
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/iostream/connection.hpp
@@ -0,0 +1,714 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_CON_HPP
+#define WEBSOCKETPP_TRANSPORT_IOSTREAM_CON_HPP
+
+#include <websocketpp/transport/iostream/base.hpp>
+
+#include <websocketpp/transport/base/connection.hpp>
+
+#include <websocketpp/uri.hpp>
+
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/connection_hdl.hpp>
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/common/platforms.hpp>
+
+#include <algorithm>
+#include <iostream>
+#include <sstream>
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace transport {
+namespace iostream {
+
+/// Empty timer class to stub out for timer functionality that iostream
+/// transport doesn't support
+struct timer {
+    void cancel() {}
+};
+
+template <typename config>
+class connection : public lib::enable_shared_from_this< connection<config> > {
+public:
+    /// Type of this connection transport component
+    typedef connection<config> type;
+    /// Type of a shared pointer to this connection transport component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// transport concurrency policy
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of this transport's access logging policy
+    typedef typename config::alog_type alog_type;
+    /// Type of this transport's error logging policy
+    typedef typename config::elog_type elog_type;
+
+    // Concurrency policy types
+    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
+    typedef typename concurrency_type::mutex_type mutex_type;
+
+    typedef lib::shared_ptr<timer> timer_ptr;
+
+    explicit connection(bool is_server, alog_type & alog, elog_type & elog)
+      : m_output_stream(NULL)
+      , m_reading(false)
+      , m_is_server(is_server)
+      , m_is_secure(false)
+      , m_alog(alog)
+      , m_elog(elog)
+      , m_remote_endpoint("iostream transport")
+    {
+        m_alog.write(log::alevel::devel,"iostream con transport constructor");
+    }
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return type::shared_from_this();
+    }
+
+    /// Register a std::ostream with the transport for writing output
+    /**
+     * Register a std::ostream with the transport. All future writes will be
+     * done to this output stream.
+     *
+     * @param o A pointer to the ostream to use for output.
+     */
+    void register_ostream(std::ostream * o) {
+        // TODO: lock transport state?
+        scoped_lock_type lock(m_read_mutex);
+        m_output_stream = o;
+    }
+
+    /// Set uri hook
+    /**
+     * Called by the endpoint as a connection is being established to provide
+     * the uri being connected to to the transport layer.
+     *
+     * This transport policy doesn't use the uri so it is ignored.
+     *
+     * @since 0.6.0
+     *
+     * @param u The uri to set
+     */
+    void set_uri(uri_ptr) {}
+
+    /// Overloaded stream input operator
+    /**
+     * Attempts to read input from the given stream into the transport. Bytes
+     * will be extracted from the input stream to fulfill any pending reads.
+     * Input in this manner will only read until the current read buffer has
+     * been filled. Then it will signal the library to process the input. If the
+     * library's input handler adds a new async_read, additional bytes will be
+     * read, otherwise the input operation will end.
+     *
+     * When this function returns one of the following conditions is true:
+     * - There is no outstanding read operation
+     * - There are no more bytes available in the input stream
+     *
+     * You can use tellg() on the input stream to determine if all of the input
+     * bytes were read or not.
+     *
+     * If there is no pending read operation when the input method is called, it
+     * will return immediately and tellg() will not have changed.
+     */
+    friend std::istream & operator>> (std::istream & in, type & t) {
+        // this serializes calls to external read.
+        scoped_lock_type lock(t.m_read_mutex);
+
+        t.read(in);
+
+        return in;
+    }
+
+    /// Manual input supply (read some)
+    /**
+     * Copies bytes from buf into WebSocket++'s input buffers. Bytes will be
+     * copied from the supplied buffer to fulfill any pending library reads. It
+     * will return the number of bytes successfully processed. If there are no
+     * pending reads read_some will return immediately. Not all of the bytes may
+     * be able to be read in one call.
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param buf Char buffer to read into the websocket
+     * @param len Length of buf
+     * @return The number of characters from buf actually read.
+     */
+    size_t read_some(char const * buf, size_t len) {
+        // this serializes calls to external read.
+        scoped_lock_type lock(m_read_mutex);
+
+        return this->read_some_impl(buf,len);
+    }
+
+    /// Manual input supply (read all)
+    /**
+     * Similar to read_some, but continues to read until all bytes in the
+     * supplied buffer have been read or the connection runs out of read
+     * requests.
+     *
+     * This method still may not read all of the bytes in the input buffer. if
+     * it doesn't it indicates that the connection was most likely closed or
+     * is in an error state where it is no longer accepting new input.
+     *
+     * @since 0.3.0
+     *
+     * @param buf Char buffer to read into the websocket
+     * @param len Length of buf
+     * @return The number of characters from buf actually read.
+     */
+    size_t read_all(char const * buf, size_t len) {
+        // this serializes calls to external read.
+        scoped_lock_type lock(m_read_mutex);
+
+        size_t total_read = 0;
+        size_t temp_read = 0;
+
+        do {
+            temp_read = this->read_some_impl(buf+total_read,len-total_read);
+            total_read += temp_read;
+        } while (temp_read != 0 && total_read < len);
+
+        return total_read;
+    }
+
+    /// Manual input supply (DEPRECATED)
+    /**
+     * @deprecated DEPRECATED in favor of read_some()
+     * @see read_some()
+     */
+    size_t readsome(char const * buf, size_t len) {
+        return this->read_some(buf,len);
+    }
+
+    /// Signal EOF
+    /**
+     * Signals to the transport that data stream being read has reached EOF and
+     * that no more bytes may be read or written to/from the transport.
+     *
+     * @since 0.3.0-alpha4
+     */
+    void eof() {
+        // this serializes calls to external read.
+        scoped_lock_type lock(m_read_mutex);
+
+        if (m_reading) {
+            complete_read(make_error_code(transport::error::eof));
+        }
+    }
+
+    /// Signal transport error
+    /**
+     * Signals to the transport that a fatal data stream error has occurred and
+     * that no more bytes may be read or written to/from the transport.
+     *
+     * @since 0.3.0-alpha4
+     */
+    void fatal_error() {
+        // this serializes calls to external read.
+        scoped_lock_type lock(m_read_mutex);
+
+        if (m_reading) {
+            complete_read(make_error_code(transport::error::pass_through));
+        }
+    }
+
+    /// Set whether or not this connection is secure
+    /**
+     * The iostream transport does not provide any security features. As such
+     * it defaults to returning false when `is_secure` is called. However, the
+     * iostream transport may be used to wrap an external socket API that may
+     * provide secure transport. This method allows that external API to flag
+     * whether or not this connection is secure so that users of the WebSocket++
+     * API will get more accurate information.
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value Whether or not this connection is secure.
+     */
+    void set_secure(bool value) {
+        m_is_secure = value;
+    }
+
+    /// Tests whether or not the underlying transport is secure
+    /**
+     * iostream transport will return false always because it has no information
+     * about the ultimate remote endpoint. This may or may not be accurate
+     * depending on the real source of bytes being input. The `set_secure`
+     * method may be used to flag connections that are secured by an external
+     * API
+     *
+     * @return Whether or not the underlying transport is secure
+     */
+    bool is_secure() const {
+        return m_is_secure;
+    }
+
+    /// Set human readable remote endpoint address
+    /**
+     * Sets the remote endpoint address returned by `get_remote_endpoint`. This
+     * value should be a human readable string that describes the remote
+     * endpoint. Typically an IP address or hostname, perhaps with a port. But
+     * may be something else depending on the nature of the underlying
+     * transport.
+     *
+     * If none is set the default is "iostream transport".
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value The remote endpoint address to set.
+     */
+    void set_remote_endpoint(std::string value) {
+        m_remote_endpoint = value;
+    }
+
+    /// Get human readable remote endpoint address
+    /**
+     * The iostream transport has no information about the ultimate remote
+     * endpoint. It will return the string "iostream transport". The
+     * `set_remote_endpoint` method may be used by external network code to set
+     * a more accurate value.
+     *
+     * This value is used in access and error logs and is available to the end
+     * application for including in user facing interfaces and messages.
+     *
+     * @return A string identifying the address of the remote endpoint
+     */
+    std::string get_remote_endpoint() const {
+        return m_remote_endpoint;
+    }
+
+    /// Get the connection handle
+    /**
+     * @return The handle for this connection.
+     */
+    connection_hdl get_handle() const {
+        return m_connection_hdl;
+    }
+
+    /// Call back a function after a period of time.
+    /**
+     * Timers are not implemented in this transport. The timer pointer will
+     * always be empty. The handler will never be called.
+     *
+     * @param duration Length of time to wait in milliseconds
+     * @param callback The function to call back when the timer has expired
+     * @return A handle that can be used to cancel the timer if it is no longer
+     * needed.
+     */
+    timer_ptr set_timer(long, timer_handler) {
+        return timer_ptr();
+    }
+
+    /// Sets the write handler
+    /**
+     * The write handler is called when the iostream transport receives data
+     * that needs to be written to the appropriate output location. This handler
+     * can be used in place of registering an ostream for output.
+     *
+     * The signature of the handler is
+     * `lib::error_code (connection_hdl, char const *, size_t)` The
+     * code returned will be reported and logged by the core library.
+     *
+     * See also, set_vector_write_handler, for an optional write handler that
+     * allows more efficient handling of multiple writes at once.
+     *
+     * @see set_vector_write_handler
+     *
+     * @since 0.5.0
+     *
+     * @param h The handler to call when data is to be written.
+     */
+    void set_write_handler(write_handler h) {
+        m_write_handler = h;
+    }
+
+    /// Sets the vectored write handler
+    /**
+     * The vectored write handler is called when the iostream transport receives
+     * multiple chunks of data that need to be written to the appropriate output
+     * location. This handler can be used in conjunction with the write_handler
+     * in place of registering an ostream for output.
+     *
+     * The sequence of buffers represents bytes that should be written
+     * consecutively and it is suggested to group the buffers into as few next
+     * layer packets as possible. Vector write is used to allow implementations
+     * that support it to coalesce writes into a single TCP packet or TLS
+     * segment for improved efficiency.
+     *
+     * This is an optional handler. If it is not defined then multiple calls
+     * will be made to the standard write handler.
+     *
+     * The signature of the handler is
+     * `lib::error_code (connection_hdl, std::vector<websocketpp::transport::buffer>
+     * const & bufs)`. The code returned will be reported and logged by the core
+     * library. The `websocketpp::transport::buffer` type is a struct with two
+     * data members. buf (char const *) and len (size_t).
+     *
+     * @since 0.6.0
+     *
+     * @param h The handler to call when vectored data is to be written.
+     */
+    void set_vector_write_handler(vector_write_handler h) {
+        m_vector_write_handler = h;
+    }
+
+    /// Sets the shutdown handler
+    /**
+     * The shutdown handler is called when the iostream transport receives a
+     * notification from the core library that it is finished with all read and
+     * write operations and that the underlying transport can be cleaned up.
+     *
+     * If you are using iostream transport with another socket library, this is
+     * a good time to close/shutdown the socket for this connection.
+     *
+     * The signature of the handler is `lib::error_code (connection_hdl)`. The
+     * code returned will be reported and logged by the core library.
+     *
+     * @since 0.5.0
+     *
+     * @param h The handler to call on connection shutdown.
+     */
+    void set_shutdown_handler(shutdown_handler h) {
+        m_shutdown_handler = h;
+    }
+protected:
+    /// Initialize the connection transport
+    /**
+     * Initialize the connection's transport component.
+     *
+     * @param handler The `init_handler` to call when initialization is done
+     */
+    void init(init_handler handler) {
+        m_alog.write(log::alevel::devel,"iostream connection init");
+        handler(lib::error_code());
+    }
+
+    /// Initiate an async_read for at least num_bytes bytes into buf
+    /**
+     * Initiates an async_read request for at least num_bytes bytes. The input
+     * will be read into buf. A maximum of len bytes will be input. When the
+     * operation is complete, handler will be called with the status and number
+     * of bytes read.
+     *
+     * This method may or may not call handler from within the initial call. The
+     * application should be prepared to accept either.
+     *
+     * The application should never call this method a second time before it has
+     * been called back for the first read. If this is done, the second read
+     * will be called back immediately with a double_read error.
+     *
+     * If num_bytes or len are zero handler will be called back immediately
+     * indicating success.
+     *
+     * @param num_bytes Don't call handler until at least this many bytes have
+     * been read.
+     * @param buf The buffer to read bytes into
+     * @param len The size of buf. At maximum, this many bytes will be read.
+     * @param handler The callback to invoke when the operation is complete or
+     * ends in an error
+     */
+    void async_read_at_least(size_t num_bytes, char *buf, size_t len,
+        read_handler handler)
+    {
+        std::stringstream s;
+        s << "iostream_con async_read_at_least: " << num_bytes;
+        m_alog.write(log::alevel::devel,s.str());
+
+        if (num_bytes > len) {
+            handler(make_error_code(error::invalid_num_bytes),size_t(0));
+            return;
+        }
+
+        if (m_reading == true) {
+            handler(make_error_code(error::double_read),size_t(0));
+            return;
+        }
+
+        if (num_bytes == 0 || len == 0) {
+            handler(lib::error_code(),size_t(0));
+            return;
+        }
+
+        m_buf = buf;
+        m_len = len;
+        m_bytes_needed = num_bytes;
+        m_read_handler = handler;
+        m_cursor = 0;
+        m_reading = true;
+    }
+
+    /// Asyncronous Transport Write
+    /**
+     * Write len bytes in buf to the output method. Call handler to report
+     * success or failure. handler may or may not be called during async_write,
+     * but it must be safe for this to happen.
+     *
+     * Will return 0 on success. Other possible errors (not exhaustive)
+     * output_stream_required: No output stream was registered to write to
+     * bad_stream: a ostream pass through error
+     *
+     * This method will attempt to write to the registered ostream first. If an
+     * ostream is not registered it will use the write handler. If neither are
+     * registered then an error is passed up to the connection.
+     *
+     * @param buf buffer to read bytes from
+     * @param len number of bytes to write
+     * @param handler Callback to invoke with operation status.
+     */
+    void async_write(char const * buf, size_t len, transport::write_handler
+        handler)
+    {
+        m_alog.write(log::alevel::devel,"iostream_con async_write");
+        // TODO: lock transport state?
+
+        lib::error_code ec;
+
+        if (m_output_stream) {
+            m_output_stream->write(buf,len);
+
+            if (m_output_stream->bad()) {
+                ec = make_error_code(error::bad_stream);
+            }
+        } else if (m_write_handler) {
+            ec = m_write_handler(m_connection_hdl, buf, len);
+        } else {
+            ec = make_error_code(error::output_stream_required);
+        }
+
+        handler(ec);
+    }
+
+    /// Asyncronous Transport Write (scatter-gather)
+    /**
+     * Write a sequence of buffers to the output method. Call handler to report
+     * success or failure. handler may or may not be called during async_write,
+     * but it must be safe for this to happen.
+     *
+     * Will return 0 on success. Other possible errors (not exhaustive)
+     * output_stream_required: No output stream was registered to write to
+     * bad_stream: a ostream pass through error
+     *
+     * This method will attempt to write to the registered ostream first. If an
+     * ostream is not registered it will use the write handler. If neither are
+     * registered then an error is passed up to the connection.
+     *
+     * @param bufs vector of buffers to write
+     * @param handler Callback to invoke with operation status.
+     */
+    void async_write(std::vector<buffer> const & bufs, transport::write_handler
+        handler)
+    {
+        m_alog.write(log::alevel::devel,"iostream_con async_write buffer list");
+        // TODO: lock transport state?
+
+        lib::error_code ec;
+
+        if (m_output_stream) {
+            std::vector<buffer>::const_iterator it;
+            for (it = bufs.begin(); it != bufs.end(); it++) {
+                m_output_stream->write((*it).buf,(*it).len);
+
+                if (m_output_stream->bad()) {
+                    ec = make_error_code(error::bad_stream);
+                    break;
+                }
+            }
+        } else if (m_vector_write_handler) {
+            ec = m_vector_write_handler(m_connection_hdl, bufs);
+        } else if (m_write_handler) {
+            std::vector<buffer>::const_iterator it;
+            for (it = bufs.begin(); it != bufs.end(); it++) {
+                ec = m_write_handler(m_connection_hdl, (*it).buf, (*it).len);
+                if (ec) {break;}
+            }
+
+        } else {
+            ec = make_error_code(error::output_stream_required);
+        }
+
+        handler(ec);
+    }
+
+    /// Set Connection Handle
+    /**
+     * @param hdl The new handle
+     */
+    void set_handle(connection_hdl hdl) {
+        m_connection_hdl = hdl;
+    }
+
+    /// Call given handler back within the transport's event system (if present)
+    /**
+     * Invoke a callback within the transport's event system if it has one. If
+     * it doesn't, the handler will be invoked immediately before this function
+     * returns.
+     *
+     * @param handler The callback to invoke
+     *
+     * @return Whether or not the transport was able to register the handler for
+     * callback.
+     */
+    lib::error_code dispatch(dispatch_handler handler) {
+        handler();
+        return lib::error_code();
+    }
+
+    /// Perform cleanup on socket shutdown_handler
+    /**
+     * If a shutdown handler is set, call it and pass through its return error
+     * code. Otherwise assume there is nothing to do and pass through a success
+     * code.
+     *
+     * @param handler The `shutdown_handler` to call back when complete
+     */
+    void async_shutdown(transport::shutdown_handler handler) {
+        lib::error_code ec;
+
+        if (m_shutdown_handler) {
+            ec = m_shutdown_handler(m_connection_hdl);
+        }
+
+        handler(ec);
+    }
+private:
+    void read(std::istream &in) {
+        m_alog.write(log::alevel::devel,"iostream_con read");
+
+        while (in.good()) {
+            if (!m_reading) {
+                m_elog.write(log::elevel::devel,"write while not reading");
+                break;
+            }
+
+            in.read(m_buf+m_cursor,static_cast<std::streamsize>(m_len-m_cursor));
+
+            if (in.gcount() == 0) {
+                m_elog.write(log::elevel::devel,"read zero bytes");
+                break;
+            }
+
+            m_cursor += static_cast<size_t>(in.gcount());
+
+            // TODO: error handling
+            if (in.bad()) {
+                m_reading = false;
+                complete_read(make_error_code(error::bad_stream));
+            }
+
+            if (m_cursor >= m_bytes_needed) {
+                m_reading = false;
+                complete_read(lib::error_code());
+            }
+        }
+    }
+
+    size_t read_some_impl(char const * buf, size_t len) {
+        m_alog.write(log::alevel::devel,"iostream_con read_some");
+
+        if (!m_reading) {
+            m_elog.write(log::elevel::devel,"write while not reading");
+            return 0;
+        }
+
+        size_t bytes_to_copy = (std::min)(len,m_len-m_cursor);
+
+        std::copy(buf,buf+bytes_to_copy,m_buf+m_cursor);
+
+        m_cursor += bytes_to_copy;
+
+        if (m_cursor >= m_bytes_needed) {
+            complete_read(lib::error_code());
+        }
+
+        return bytes_to_copy;
+    }
+
+    /// Signal that a requested read is complete
+    /**
+     * Sets the reading flag to false and returns the handler that should be
+     * called back with the result of the read. The cursor position that is sent
+     * is whatever the value of m_cursor is.
+     *
+     * It MUST NOT be called when m_reading is false.
+     * it MUST be called while holding the read lock
+     *
+     * It is important to use this method rather than directly setting/calling
+     * m_read_handler back because this function makes sure to delete the
+     * locally stored handler which contains shared pointers that will otherwise
+     * cause circular reference based memory leaks.
+     *
+     * @param ec The error code to forward to the read handler
+     */
+    void complete_read(lib::error_code const & ec) {
+        m_reading = false;
+
+        read_handler handler = m_read_handler;
+        m_read_handler = read_handler();
+
+        handler(ec,m_cursor);
+    }
+
+    // Read space (Protected by m_read_mutex)
+    char *          m_buf;
+    size_t          m_len;
+    size_t          m_bytes_needed;
+    read_handler    m_read_handler;
+    size_t          m_cursor;
+
+    // transport resources
+    std::ostream *  m_output_stream;
+    connection_hdl  m_connection_hdl;
+    write_handler   m_write_handler;
+    vector_write_handler m_vector_write_handler;
+    shutdown_handler    m_shutdown_handler;
+
+    bool            m_reading;
+    bool const      m_is_server;
+    bool            m_is_secure;
+    alog_type &     m_alog;
+    elog_type &     m_elog;
+    std::string     m_remote_endpoint;
+
+    // This lock ensures that only one thread can edit read data for this
+    // connection. This is a very coarse lock that is basically locked all the
+    // time. The nature of the connection is such that it cannot be
+    // parallelized, the locking is here to prevent intra-connection concurrency
+    // in order to allow inter-connection concurrency.
+    mutex_type      m_read_mutex;
+};
+
+
+} // namespace iostream
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_IOSTREAM_CON_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/iostream/endpoint.hpp b/vendor/websocketpp/websocketpp/transport/iostream/endpoint.hpp
new file mode 100644
index 0000000..14ec653
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/iostream/endpoint.hpp
@@ -0,0 +1,222 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_IOSTREAM_HPP
+#define WEBSOCKETPP_TRANSPORT_IOSTREAM_HPP
+
+#include <websocketpp/transport/base/endpoint.hpp>
+#include <websocketpp/transport/iostream/connection.hpp>
+
+#include <websocketpp/uri.hpp>
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/memory.hpp>
+
+#include <ostream>
+
+namespace websocketpp {
+namespace transport {
+namespace iostream {
+
+template <typename config>
+class endpoint {
+public:
+    /// Type of this endpoint transport component
+    typedef endpoint type;
+    /// Type of a pointer to this endpoint transport component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// Type of this endpoint's concurrency policy
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of this endpoint's error logging policy
+    typedef typename config::elog_type elog_type;
+    /// Type of this endpoint's access logging policy
+    typedef typename config::alog_type alog_type;
+
+    /// Type of this endpoint transport component's associated connection
+    /// transport component.
+    typedef iostream::connection<config> transport_con_type;
+    /// Type of a shared pointer to this endpoint transport component's
+    /// associated connection transport component
+    typedef typename transport_con_type::ptr transport_con_ptr;
+
+    // generate and manage our own io_service
+    explicit endpoint() : m_output_stream(NULL), m_is_secure(false)
+    {
+        //std::cout << "transport::iostream::endpoint constructor" << std::endl;
+    }
+
+    /// Register a default output stream
+    /**
+     * The specified output stream will be assigned to future connections as the
+     * default output stream.
+     *
+     * @param o The ostream to use as the default output stream.
+     */
+    void register_ostream(std::ostream * o) {
+        m_alog->write(log::alevel::devel,"register_ostream");
+        m_output_stream = o;
+    }
+
+    /// Set whether or not endpoint can create secure connections
+    /**
+     * The iostream transport does not provide any security features. As such
+     * it defaults to returning false when `is_secure` is called. However, the
+     * iostream transport may be used to wrap an external socket API that may
+     * provide secure transport. This method allows that external API to flag
+     * whether or not it can create secure connections so that users of the
+     * WebSocket++ API will get more accurate information.
+     *
+     * Setting this value only indicates whether or not the endpoint is capable
+     * of producing and managing secure connections. Connections produced by
+     * this endpoint must also be individually flagged as secure if they are.
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value Whether or not the endpoint can create secure connections.
+     */
+    void set_secure(bool value) {
+        m_is_secure = value;
+    }
+
+    /// Tests whether or not the underlying transport is secure
+    /**
+     * iostream transport will return false by default because it has no
+     * information about the ultimate remote endpoint. This may or may not be
+     * accurate depending on the real source of bytes being input. `set_secure`
+     * may be used by a wrapper API to correct the return value in the case that
+     * secure connections are in fact possible.
+     *
+     * @return Whether or not the underlying transport is secure
+     */
+    bool is_secure() const {
+        return m_is_secure;
+    }
+    
+    /// Sets the write handler
+    /**
+     * The write handler is called when the iostream transport receives data
+     * that needs to be written to the appropriate output location. This handler
+     * can be used in place of registering an ostream for output.
+     *
+     * The signature of the handler is 
+     * `lib::error_code (connection_hdl, char const *, size_t)` The
+     * code returned will be reported and logged by the core library.
+     *
+     * @since 0.5.0
+     *
+     * @param h The handler to call on connection shutdown.
+     */
+    void set_write_handler(write_handler h) {
+        m_write_handler = h;
+    }
+    
+    /// Sets the shutdown handler
+    /**
+     * The shutdown handler is called when the iostream transport receives a
+     * notification from the core library that it is finished with all read and
+     * write operations and that the underlying transport can be cleaned up.
+     *
+     * If you are using iostream transport with another socket library, this is
+     * a good time to close/shutdown the socket for this connection.
+     *
+     * The signature of the handler is lib::error_code (connection_hdl). The
+     * code returned will be reported and logged by the core library.
+     *
+     * @since 0.5.0
+     *
+     * @param h The handler to call on connection shutdown.
+     */
+    void set_shutdown_handler(shutdown_handler h) {
+        m_shutdown_handler = h;
+    }
+protected:
+    /// Initialize logging
+    /**
+     * The loggers are located in the main endpoint class. As such, the
+     * transport doesn't have direct access to them. This method is called
+     * by the endpoint constructor to allow shared logging from the transport
+     * component. These are raw pointers to member variables of the endpoint.
+     * In particular, they cannot be used in the transport constructor as they
+     * haven't been constructed yet, and cannot be used in the transport
+     * destructor as they will have been destroyed by then.
+     *
+     * @param a A pointer to the access logger to use.
+     * @param e A pointer to the error logger to use.
+     */
+    void init_logging(alog_type * a, elog_type * e) {
+        m_elog = e;
+        m_alog = a;
+    }
+
+    /// Initiate a new connection
+    /**
+     * @param tcon A pointer to the transport connection component of the
+     * connection to connect.
+     * @param u A URI pointer to the URI to connect to.
+     * @param cb The function to call back with the results when complete.
+     */
+    void async_connect(transport_con_ptr, uri_ptr, connect_handler cb) {
+        cb(lib::error_code());
+    }
+
+    /// Initialize a connection
+    /**
+     * Init is called by an endpoint once for each newly created connection.
+     * It's purpose is to give the transport policy the chance to perform any
+     * transport specific initialization that couldn't be done via the default
+     * constructor.
+     *
+     * @param tcon A pointer to the transport portion of the connection.
+     * @return A status code indicating the success or failure of the operation
+     */
+    lib::error_code init(transport_con_ptr tcon) {
+        tcon->register_ostream(m_output_stream);
+        if (m_shutdown_handler) {
+            tcon->set_shutdown_handler(m_shutdown_handler);
+        }
+        if (m_write_handler) {
+            tcon->set_write_handler(m_write_handler);
+        }
+        return lib::error_code();
+    }
+private:
+    std::ostream *  m_output_stream;
+    shutdown_handler m_shutdown_handler;
+    write_handler   m_write_handler;
+    
+    elog_type *     m_elog;
+    alog_type *     m_alog;
+    bool            m_is_secure;
+};
+
+
+} // namespace iostream
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_IOSTREAM_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/stub/base.hpp b/vendor/websocketpp/websocketpp/transport/stub/base.hpp
new file mode 100644
index 0000000..754981e
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/stub/base.hpp
@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_STUB_BASE_HPP
+#define WEBSOCKETPP_TRANSPORT_STUB_BASE_HPP
+
+#include <websocketpp/common/system_error.hpp>
+#include <websocketpp/common/cpp11.hpp>
+
+#include <string>
+
+namespace websocketpp {
+namespace transport {
+/// Stub transport policy that has no input or output.
+namespace stub {
+
+/// stub transport errors
+namespace error {
+enum value {
+    /// Catch-all error for transport policy errors that don't fit in other
+    /// categories
+    general = 1,
+
+    /// not implemented
+    not_implemented
+};
+
+/// stub transport error category
+class category : public lib::error_category {
+    public:
+    category() {}
+
+    char const * name() const _WEBSOCKETPP_NOEXCEPT_TOKEN_ {
+        return "websocketpp.transport.stub";
+    }
+
+    std::string message(int value) const {
+        switch(value) {
+            case general:
+                return "Generic stub transport policy error";
+            case not_implemented:
+                return "feature not implemented";
+            default:
+                return "Unknown";
+        }
+    }
+};
+
+/// Get a reference to a static copy of the stub transport error category
+inline lib::error_category const & get_category() {
+    static category instance;
+    return instance;
+}
+
+/// Get an error code with the given value and the stub transport category
+inline lib::error_code make_error_code(error::value e) {
+    return lib::error_code(static_cast<int>(e), get_category());
+}
+
+} // namespace error
+} // namespace stub
+} // namespace transport
+} // namespace websocketpp
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_START_
+template<> struct is_error_code_enum<websocketpp::transport::stub::error::value>
+{
+    static bool const value = true;
+};
+_WEBSOCKETPP_ERROR_CODE_ENUM_NS_END_
+
+#endif // WEBSOCKETPP_TRANSPORT_STUB_BASE_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/stub/connection.hpp b/vendor/websocketpp/websocketpp/transport/stub/connection.hpp
new file mode 100644
index 0000000..59bd4a0
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/stub/connection.hpp
@@ -0,0 +1,286 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_STUB_CON_HPP
+#define WEBSOCKETPP_TRANSPORT_STUB_CON_HPP
+
+#include <websocketpp/transport/stub/base.hpp>
+
+#include <websocketpp/transport/base/connection.hpp>
+
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/common/connection_hdl.hpp>
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/common/platforms.hpp>
+
+#include <string>
+#include <vector>
+
+namespace websocketpp {
+namespace transport {
+namespace stub {
+
+/// Empty timer class to stub out for timer functionality that stub
+/// transport doesn't support
+struct timer {
+    void cancel() {}
+};
+
+template <typename config>
+class connection : public lib::enable_shared_from_this< connection<config> > {
+public:
+    /// Type of this connection transport component
+    typedef connection<config> type;
+    /// Type of a shared pointer to this connection transport component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// transport concurrency policy
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of this transport's access logging policy
+    typedef typename config::alog_type alog_type;
+    /// Type of this transport's error logging policy
+    typedef typename config::elog_type elog_type;
+
+    // Concurrency policy types
+    typedef typename concurrency_type::scoped_lock_type scoped_lock_type;
+    typedef typename concurrency_type::mutex_type mutex_type;
+
+    typedef lib::shared_ptr<timer> timer_ptr;
+
+    explicit connection(bool is_server, alog_type & alog, elog_type & elog)
+      : m_alog(alog), m_elog(elog)
+    {
+        m_alog.write(log::alevel::devel,"stub con transport constructor");
+    }
+
+    /// Get a shared pointer to this component
+    ptr get_shared() {
+        return type::shared_from_this();
+    }
+
+    /// Set whether or not this connection is secure
+    /**
+     * Todo: docs
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value Whether or not this connection is secure.
+     */
+    void set_secure(bool value) {}
+
+    /// Tests whether or not the underlying transport is secure
+    /**
+     * TODO: docs
+     *
+     * @return Whether or not the underlying transport is secure
+     */
+    bool is_secure() const {
+        return false;
+    }
+
+    /// Set uri hook
+    /**
+     * Called by the endpoint as a connection is being established to provide
+     * the uri being connected to to the transport layer.
+     *
+     * Implementation is optional and can be ignored if the transport has no
+     * need for this information.
+     *
+     * @since 0.6.0
+     *
+     * @param u The uri to set
+     */
+    void set_uri(uri_ptr) {}
+
+    /// Set human readable remote endpoint address
+    /**
+     * Sets the remote endpoint address returned by `get_remote_endpoint`. This
+     * value should be a human readable string that describes the remote
+     * endpoint. Typically an IP address or hostname, perhaps with a port. But
+     * may be something else depending on the nature of the underlying
+     * transport.
+     *
+     * If none is set a default is returned.
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value The remote endpoint address to set.
+     */
+    void set_remote_endpoint(std::string value) {}
+
+    /// Get human readable remote endpoint address
+    /**
+     * TODO: docs
+     *
+     * This value is used in access and error logs and is available to the end
+     * application for including in user facing interfaces and messages.
+     *
+     * @return A string identifying the address of the remote endpoint
+     */
+    std::string get_remote_endpoint() const {
+        return "unknown (stub transport)";
+    }
+
+    /// Get the connection handle
+    /**
+     * @return The handle for this connection.
+     */
+    connection_hdl get_handle() const {
+        return connection_hdl();
+    }
+
+    /// Call back a function after a period of time.
+    /**
+     * Timers are not implemented in this transport. The timer pointer will
+     * always be empty. The handler will never be called.
+     *
+     * @param duration Length of time to wait in milliseconds
+     * @param callback The function to call back when the timer has expired
+     * @return A handle that can be used to cancel the timer if it is no longer
+     * needed.
+     */
+    timer_ptr set_timer(long duration, timer_handler handler) {
+        return timer_ptr();
+    }
+protected:
+    /// Initialize the connection transport
+    /**
+     * Initialize the connection's transport component.
+     *
+     * @param handler The `init_handler` to call when initialization is done
+     */
+    void init(init_handler handler) {
+        m_alog.write(log::alevel::devel,"stub connection init");
+        handler(make_error_code(error::not_implemented));
+    }
+
+    /// Initiate an async_read for at least num_bytes bytes into buf
+    /**
+     * Initiates an async_read request for at least num_bytes bytes. The input
+     * will be read into buf. A maximum of len bytes will be input. When the
+     * operation is complete, handler will be called with the status and number
+     * of bytes read.
+     *
+     * This method may or may not call handler from within the initial call. The
+     * application should be prepared to accept either.
+     *
+     * The application should never call this method a second time before it has
+     * been called back for the first read. If this is done, the second read
+     * will be called back immediately with a double_read error.
+     *
+     * If num_bytes or len are zero handler will be called back immediately
+     * indicating success.
+     *
+     * @param num_bytes Don't call handler until at least this many bytes have
+     * been read.
+     * @param buf The buffer to read bytes into
+     * @param len The size of buf. At maximum, this many bytes will be read.
+     * @param handler The callback to invoke when the operation is complete or
+     * ends in an error
+     */
+    void async_read_at_least(size_t num_bytes, char * buf, size_t len,
+        read_handler handler)
+    {
+        m_alog.write(log::alevel::devel, "stub_con async_read_at_least");
+        handler(make_error_code(error::not_implemented), 0);
+    }
+
+    /// Asyncronous Transport Write
+    /**
+     * Write len bytes in buf to the output stream. Call handler to report
+     * success or failure. handler may or may not be called during async_write,
+     * but it must be safe for this to happen.
+     *
+     * Will return 0 on success.
+     *
+     * @param buf buffer to read bytes from
+     * @param len number of bytes to write
+     * @param handler Callback to invoke with operation status.
+     */
+    void async_write(char const * buf, size_t len, write_handler handler) {
+        m_alog.write(log::alevel::devel,"stub_con async_write");
+        handler(make_error_code(error::not_implemented));
+    }
+
+    /// Asyncronous Transport Write (scatter-gather)
+    /**
+     * Write a sequence of buffers to the output stream. Call handler to report
+     * success or failure. handler may or may not be called during async_write,
+     * but it must be safe for this to happen.
+     *
+     * Will return 0 on success.
+     *
+     * @param bufs vector of buffers to write
+     * @param handler Callback to invoke with operation status.
+     */
+    void async_write(std::vector<buffer> const & bufs, write_handler handler) {
+        m_alog.write(log::alevel::devel,"stub_con async_write buffer list");
+        handler(make_error_code(error::not_implemented));
+    }
+
+    /// Set Connection Handle
+    /**
+     * @param hdl The new handle
+     */
+    void set_handle(connection_hdl hdl) {}
+
+    /// Call given handler back within the transport's event system (if present)
+    /**
+     * Invoke a callback within the transport's event system if it has one. If
+     * it doesn't, the handler will be invoked immediately before this function
+     * returns.
+     *
+     * @param handler The callback to invoke
+     *
+     * @return Whether or not the transport was able to register the handler for
+     * callback.
+     */
+    lib::error_code dispatch(dispatch_handler handler) {
+        handler();
+        return lib::error_code();
+    }
+
+    /// Perform cleanup on socket shutdown_handler
+    /**
+     * @param h The `shutdown_handler` to call back when complete
+     */
+    void async_shutdown(shutdown_handler handler) {
+        handler(lib::error_code());
+    }
+private:
+    // member variables!
+    alog_type & m_alog;
+    elog_type & m_elog;
+};
+
+
+} // namespace stub
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_STUB_CON_HPP
diff --git a/vendor/websocketpp/websocketpp/transport/stub/endpoint.hpp b/vendor/websocketpp/websocketpp/transport/stub/endpoint.hpp
new file mode 100644
index 0000000..3bbb78f
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/transport/stub/endpoint.hpp
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_TRANSPORT_STUB_HPP
+#define WEBSOCKETPP_TRANSPORT_STUB_HPP
+
+#include <websocketpp/common/memory.hpp>
+#include <websocketpp/logger/levels.hpp>
+
+#include <websocketpp/transport/base/endpoint.hpp>
+#include <websocketpp/transport/stub/connection.hpp>
+
+namespace websocketpp {
+namespace transport {
+namespace stub {
+
+template <typename config>
+class endpoint {
+public:
+    /// Type of this endpoint transport component
+    typedef endpoint type;
+    /// Type of a pointer to this endpoint transport component
+    typedef lib::shared_ptr<type> ptr;
+
+    /// Type of this endpoint's concurrency policy
+    typedef typename config::concurrency_type concurrency_type;
+    /// Type of this endpoint's error logging policy
+    typedef typename config::elog_type elog_type;
+    /// Type of this endpoint's access logging policy
+    typedef typename config::alog_type alog_type;
+
+    /// Type of this endpoint transport component's associated connection
+    /// transport component.
+    typedef stub::connection<config> transport_con_type;
+    /// Type of a shared pointer to this endpoint transport component's
+    /// associated connection transport component
+    typedef typename transport_con_type::ptr transport_con_ptr;
+
+    // generate and manage our own io_service
+    explicit endpoint()
+    {
+        //std::cout << "transport::iostream::endpoint constructor" << std::endl;
+    }
+
+    /// Set whether or not endpoint can create secure connections
+    /**
+     * TODO: docs
+     *
+     * Setting this value only indicates whether or not the endpoint is capable
+     * of producing and managing secure connections. Connections produced by
+     * this endpoint must also be individually flagged as secure if they are.
+     *
+     * @since 0.3.0-alpha4
+     *
+     * @param value Whether or not the endpoint can create secure connections.
+     */
+    void set_secure(bool value) {}
+
+    /// Tests whether or not the underlying transport is secure
+    /**
+     * TODO: docs
+     *
+     * @return Whether or not the underlying transport is secure
+     */
+    bool is_secure() const {
+        return false;
+    }
+protected:
+    /// Initialize logging
+    /**
+     * The loggers are located in the main endpoint class. As such, the
+     * transport doesn't have direct access to them. This method is called
+     * by the endpoint constructor to allow shared logging from the transport
+     * component. These are raw pointers to member variables of the endpoint.
+     * In particular, they cannot be used in the transport constructor as they
+     * haven't been constructed yet, and cannot be used in the transport
+     * destructor as they will have been destroyed by then.
+     *
+     * @param a A pointer to the access logger to use.
+     * @param e A pointer to the error logger to use.
+     */
+    void init_logging(alog_type * a, elog_type * e) {}
+
+    /// Initiate a new connection
+    /**
+     * @param tcon A pointer to the transport connection component of the
+     * connection to connect.
+     * @param u A URI pointer to the URI to connect to.
+     * @param cb The function to call back with the results when complete.
+     */
+    void async_connect(transport_con_ptr tcon, uri_ptr u, connect_handler cb) {
+        cb(make_error_code(error::not_implemented));
+    }
+
+    /// Initialize a connection
+    /**
+     * Init is called by an endpoint once for each newly created connection.
+     * It's purpose is to give the transport policy the chance to perform any
+     * transport specific initialization that couldn't be done via the default
+     * constructor.
+     *
+     * @param tcon A pointer to the transport portion of the connection.
+     * @return A status code indicating the success or failure of the operation
+     */
+    lib::error_code init(transport_con_ptr tcon) {
+        return make_error_code(error::not_implemented);
+    }
+private:
+
+};
+
+} // namespace stub
+} // namespace transport
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_TRANSPORT_STUB_HPP
diff --git a/vendor/websocketpp/websocketpp/uri.hpp b/vendor/websocketpp/websocketpp/uri.hpp
new file mode 100644
index 0000000..7159234
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/uri.hpp
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_URI_HPP
+#define WEBSOCKETPP_URI_HPP
+
+#include <websocketpp/error.hpp>
+
+#include <websocketpp/common/memory.hpp>
+
+#include <algorithm>
+#include <sstream>
+#include <string>
+
+namespace websocketpp {
+
+// TODO: figure out why this fixes horrible linking errors.
+
+/// Default port for ws://
+static uint16_t const uri_default_port = 80;
+/// Default port for wss://
+static uint16_t const uri_default_secure_port = 443;
+
+class uri {
+public:
+    explicit uri(std::string const & uri_string) : m_valid(false) {
+        std::string::const_iterator it;
+        std::string::const_iterator temp;
+
+        int state = 0;
+
+        it = uri_string.begin();
+        size_t uri_len = uri_string.length();
+
+        if (uri_len >= 7 && std::equal(it,it+6,"wss://")) {
+            m_secure = true;
+            m_scheme = "wss";
+            it += 6;
+        } else if (uri_len >= 6 && std::equal(it,it+5,"ws://")) {
+            m_secure = false;
+            m_scheme = "ws";
+            it += 5;
+        } else if (uri_len >= 8 && std::equal(it,it+7,"http://")) {
+            m_secure = false;
+            m_scheme = "http";
+            it += 7;
+        } else if (uri_len >= 9 && std::equal(it,it+8,"https://")) {
+            m_secure = true;
+            m_scheme = "https";
+            it += 8;
+        } else {
+            return;
+        }
+
+        // extract host.
+        // either a host string
+        // an IPv4 address
+        // or an IPv6 address
+        if (*it == '[') {
+            ++it;
+            // IPv6 literal
+            // extract IPv6 digits until ]
+
+            // TODO: this doesn't work on g++... not sure why
+            //temp = std::find(it,it2,']');
+
+            temp = it;
+            while (temp != uri_string.end()) {
+                if (*temp == ']') {
+                    break;
+                }
+                ++temp;
+            }
+
+            if (temp == uri_string.end()) {
+                return;
+            } else {
+                // validate IPv6 literal parts
+                // can contain numbers, a-f and A-F
+                m_host.append(it,temp);
+            }
+            it = temp+1;
+            if (it == uri_string.end()) {
+                state = 2;
+            } else if (*it == '/') {
+                state = 2;
+                ++it;
+            } else if (*it == ':') {
+                state = 1;
+                ++it;
+            } else {
+                // problem
+                return;
+            }
+        } else {
+            // IPv4 or hostname
+            // extract until : or /
+            while (state == 0) {
+                if (it == uri_string.end()) {
+                    state = 2;
+                    break;
+                } else if (*it == '/') {
+                    state = 2;
+                } else if (*it == ':') {
+                    // end hostname start port
+                    state = 1;
+                } else {
+                    m_host += *it;
+                }
+                ++it;
+            }
+        }
+
+        // parse port
+        std::string port;
+        while (state == 1) {
+            if (it == uri_string.end()) {
+                // state is not used after this point presently.
+                // this should be re-enabled if it ever is needed in a future
+                // refactoring
+                //state = 3;
+                break;
+            } else if (*it == '/') {
+                state = 3;
+            } else {
+                port += *it;
+            }
+            ++it;
+        }
+
+        lib::error_code ec;
+        m_port = get_port_from_string(port, ec);
+
+        if (ec) {
+            return;
+        }
+
+        m_resource = "/";
+        m_resource.append(it,uri_string.end());
+
+
+        m_valid = true;
+    }
+
+    uri(bool secure, std::string const & host, uint16_t port,
+        std::string const & resource)
+      : m_scheme(secure ? "wss" : "ws")
+      , m_host(host)
+      , m_resource(resource.empty() ? "/" : resource)
+      , m_port(port)
+      , m_secure(secure)
+      , m_valid(true) {}
+
+    uri(bool secure, std::string const & host, std::string const & resource)
+      : m_scheme(secure ? "wss" : "ws")
+      , m_host(host)
+      , m_resource(resource.empty() ? "/" : resource)
+      , m_port(secure ? uri_default_secure_port : uri_default_port)
+      , m_secure(secure)
+      , m_valid(true) {}
+
+    uri(bool secure, std::string const & host, std::string const & port,
+        std::string const & resource)
+      : m_scheme(secure ? "wss" : "ws")
+      , m_host(host)
+      , m_resource(resource.empty() ? "/" : resource)
+      , m_secure(secure)
+    {
+        lib::error_code ec;
+        m_port = get_port_from_string(port,ec);
+        m_valid = !ec;
+    }
+
+    uri(std::string const & scheme, std::string const & host, uint16_t port,
+        std::string const & resource)
+      : m_scheme(scheme)
+      , m_host(host)
+      , m_resource(resource.empty() ? "/" : resource)
+      , m_port(port)
+      , m_secure(scheme == "wss" || scheme == "https")
+      , m_valid(true) {}
+
+    uri(std::string scheme, std::string const & host, std::string const & resource)
+      : m_scheme(scheme)
+      , m_host(host)
+      , m_resource(resource.empty() ? "/" : resource)
+      , m_port((scheme == "wss" || scheme == "https") ? uri_default_secure_port : uri_default_port)
+      , m_secure(scheme == "wss" || scheme == "https")
+      , m_valid(true) {}
+
+    uri(std::string const & scheme, std::string const & host,
+        std::string const & port, std::string const & resource)
+      : m_scheme(scheme)
+      , m_host(host)
+      , m_resource(resource.empty() ? "/" : resource)
+      , m_secure(scheme == "wss" || scheme == "https")
+    {
+        lib::error_code ec;
+        m_port = get_port_from_string(port,ec);
+        m_valid = !ec;
+    }
+
+    bool get_valid() const {
+        return m_valid;
+    }
+
+    bool get_secure() const {
+        return m_secure;
+    }
+
+    std::string const & get_scheme() const {
+        return m_scheme;
+    }
+
+    std::string const & get_host() const {
+        return m_host;
+    }
+
+    std::string get_host_port() const {
+        if (m_port == (m_secure ? uri_default_secure_port : uri_default_port)) {
+            return m_host;
+        } else {
+            std::stringstream p;
+            p << m_host << ":" << m_port;
+            return p.str();
+        }
+    }
+
+    std::string get_authority() const {
+        std::stringstream p;
+        p << m_host << ":" << m_port;
+        return p.str();
+    }
+
+    uint16_t get_port() const {
+        return m_port;
+    }
+
+    std::string get_port_str() const {
+        std::stringstream p;
+        p << m_port;
+        return p.str();
+    }
+
+    std::string const & get_resource() const {
+        return m_resource;
+    }
+
+    std::string str() const {
+        std::stringstream s;
+
+        s << m_scheme << "://" << m_host;
+
+        if (m_port != (m_secure ? uri_default_secure_port : uri_default_port)) {
+            s << ":" << m_port;
+        }
+
+        s << m_resource;
+        return s.str();
+    }
+
+    /// Return the query portion
+    /**
+     * Returns the query portion (after the ?) of the URI or an empty string if
+     * there is none.
+     *
+     * @return query portion of the URI.
+     */
+    std::string get_query() const {
+        std::size_t found = m_resource.find('?');
+        if (found != std::string::npos) {
+            return m_resource.substr(found + 1);
+        } else {
+            return "";
+        }
+    }
+
+    // get fragment
+
+    // hi <3
+
+    // get the string representation of this URI
+
+    //std::string base() const; // is this still needed?
+
+    // setter methods set some or all (in the case of parse) based on the input.
+    // These functions throw a uri_exception on failure.
+    /*void set_uri(const std::string& uri);
+
+    void set_secure(bool secure);
+    void set_host(const std::string& host);
+    void set_port(uint16_t port);
+    void set_port(const std::string& port);
+    void set_resource(const std::string& resource);*/
+private:
+    uint16_t get_port_from_string(std::string const & port, lib::error_code &
+        ec) const
+    {
+        ec = lib::error_code();
+
+        if (port.empty()) {
+            return (m_secure ? uri_default_secure_port : uri_default_port);
+        }
+
+        unsigned int t_port = static_cast<unsigned int>(atoi(port.c_str()));
+
+        if (t_port > 65535) {
+            ec = error::make_error_code(error::invalid_port);
+        }
+
+        if (t_port == 0) {
+            ec = error::make_error_code(error::invalid_port);
+        }
+
+        return static_cast<uint16_t>(t_port);
+    }
+
+    std::string m_scheme;
+    std::string m_host;
+    std::string m_resource;
+    uint16_t    m_port;
+    bool        m_secure;
+    bool        m_valid;
+};
+
+/// Pointer to a URI
+typedef lib::shared_ptr<uri> uri_ptr;
+
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_URI_HPP
diff --git a/vendor/websocketpp/websocketpp/utf8_validator.hpp b/vendor/websocketpp/websocketpp/utf8_validator.hpp
new file mode 100644
index 0000000..c057da6
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/utf8_validator.hpp
@@ -0,0 +1,154 @@
+/*
+ * The following code is adapted from code originally written by Bjoern
+ * Hoehrmann <bjoern@hoehrmann.de>. See
+ * http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ for details.
+ *
+ * The original license:
+ *
+ * Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+*/
+
+#ifndef UTF8_VALIDATOR_HPP
+#define UTF8_VALIDATOR_HPP
+
+#include <websocketpp/common/stdint.hpp>
+
+#include <string>
+
+namespace websocketpp {
+namespace utf8_validator {
+
+/// State that represents a valid utf8 input sequence
+static unsigned int const utf8_accept = 0;
+/// State that represents an invalid utf8 input sequence
+static unsigned int const utf8_reject = 1;
+
+/// Lookup table for the UTF8 decode state machine
+static uint8_t const utf8d[] = {
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 00..1f
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 20..3f
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 40..5f
+  0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // 60..7f
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, // 80..9f
+  7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, // a0..bf
+  8,8,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, // c0..df
+  0xa,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x3,0x4,0x3,0x3, // e0..ef
+  0xb,0x6,0x6,0x6,0x5,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8,0x8, // f0..ff
+  0x0,0x1,0x2,0x3,0x5,0x8,0x7,0x1,0x1,0x1,0x4,0x6,0x1,0x1,0x1,0x1, // s0..s0
+  1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,0,1,1,1,1,1,0,1,0,1,1,1,1,1,1, // s1..s2
+  1,2,1,1,1,1,1,2,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1, // s3..s4
+  1,2,1,1,1,1,1,1,1,2,1,1,1,1,1,1,1,1,1,1,1,1,1,3,1,3,1,1,1,1,1,1, // s5..s6
+  1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8
+};
+
+/// Decode the next byte of a UTF8 sequence
+/**
+ * @param [out] state The decoder state to advance
+ * @param [out] codep The codepoint to fill in
+ * @param [in] byte The byte to input
+ * @return The ending state of the decode operation
+ */
+inline uint32_t decode(uint32_t * state, uint32_t * codep, uint8_t byte) {
+  uint32_t type = utf8d[byte];
+
+  *codep = (*state != utf8_accept) ?
+    (byte & 0x3fu) | (*codep << 6) :
+    (0xff >> type) & (byte);
+
+  *state = utf8d[256 + *state*16 + type];
+  return *state;
+}
+
+/// Provides streaming UTF8 validation functionality
+class validator {
+public:
+    /// Construct and initialize the validator
+    validator() : m_state(utf8_accept),m_codepoint(0) {}
+
+    /// Advance the state of the validator with the next input byte
+    /**
+     * @param byte The byte to advance the validation state with
+     * @return Whether or not the byte resulted in a validation error.
+     */
+    bool consume (uint8_t byte) {
+        if (utf8_validator::decode(&m_state,&m_codepoint,byte) == utf8_reject) {
+            return false;
+        }
+        return true;
+    }
+
+    /// Advance validator state with input from an iterator pair
+    /**
+     * @param begin Input iterator to the start of the input range
+     * @param end Input iterator to the end of the input range
+     * @return Whether or not decoding the bytes resulted in a validation error.
+     */
+    template <typename iterator_type>
+    bool decode (iterator_type begin, iterator_type end) {
+        for (iterator_type it = begin; it != end; ++it) {
+            unsigned int result = utf8_validator::decode(
+                &m_state,
+                &m_codepoint,
+                static_cast<uint8_t>(*it)
+            );
+
+            if (result == utf8_reject) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /// Return whether the input sequence ended on a valid utf8 codepoint
+    /**
+     * @return Whether or not the input sequence ended on a valid codepoint.
+     */
+    bool complete() {
+        return m_state == utf8_accept;
+    }
+
+    /// Reset the validator to decode another message
+    void reset() {
+        m_state = utf8_accept;
+        m_codepoint = 0;
+    }
+private:
+    uint32_t    m_state;
+    uint32_t    m_codepoint;
+};
+
+/// Validate a UTF8 string
+/**
+ * convenience function that creates a validator, validates a complete string
+ * and returns the result.
+ */
+inline bool validate(std::string const & s) {
+    validator v;
+    if (!v.decode(s.begin(),s.end())) {
+        return false;
+    }
+    return v.complete();
+}
+
+} // namespace utf8_validator
+} // namespace websocketpp
+
+#endif // UTF8_VALIDATOR_HPP
diff --git a/vendor/websocketpp/websocketpp/utilities.hpp b/vendor/websocketpp/websocketpp/utilities.hpp
new file mode 100644
index 0000000..747f119
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/utilities.hpp
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_UTILITIES_HPP
+#define WEBSOCKETPP_UTILITIES_HPP
+
+#include <websocketpp/common/stdint.hpp>
+
+#include <algorithm>
+#include <string>
+#include <locale>
+
+namespace websocketpp {
+/// Generic non-websocket specific utility functions and data structures
+namespace utility {
+
+/// Helper functor for case insensitive find
+/**
+ * Based on code from
+ * http://stackoverflow.com/questions/3152241/case-insensitive-stdstring-find
+ *
+ * templated version of my_equal so it could work with both char and wchar_t
+ */
+template<typename charT>
+struct my_equal {
+    /// Construct the functor with the given locale
+    /**
+     * @param [in] loc The locale to use for determining the case of values
+     */
+    my_equal(std::locale const & loc ) : m_loc(loc) {}
+
+    /// Perform a case insensitive comparison
+    /**
+     * @param ch1 The first value to compare
+     * @param ch2 The second value to compare
+     * @return Whether or not the two values are equal when both are converted
+     *         to uppercase using the given locale.
+     */
+    bool operator()(charT ch1, charT ch2) {
+        return std::toupper(ch1, m_loc) == std::toupper(ch2, m_loc);
+    }
+private:
+    std::locale const & m_loc;
+};
+
+/// Helper less than functor for case insensitive find
+/**
+ * Based on code from
+ * http://stackoverflow.com/questions/3152241/case-insensitive-stdstring-find
+ */
+struct ci_less : std::binary_function<std::string, std::string, bool> {
+    // case-independent (ci) compare_less binary function
+    struct nocase_compare
+      : public std::binary_function<unsigned char,unsigned char,bool>
+    {
+        bool operator() (unsigned char const & c1, unsigned char const & c2) const {
+            return tolower (c1) < tolower (c2);
+        }
+    };
+    bool operator() (std::string const & s1, std::string const & s2) const {
+        return std::lexicographical_compare
+            (s1.begin (), s1.end (),   // source range
+            s2.begin (), s2.end (),   // dest range
+            nocase_compare ());  // comparison
+    }
+};
+
+/// Find substring (case insensitive)
+/**
+ * @param [in] haystack The string to search in
+ * @param [in] needle The string to search for
+ * @param [in] loc The locale to use for determining the case of values.
+ *             Defaults to the current locale.
+ * @return An iterator to the first element of the first occurrance of needle in
+ *         haystack. If the sequence is not found, the function returns
+ *         haystack.end()
+ */
+template<typename T>
+typename T::const_iterator ci_find_substr(T const & haystack, T const & needle,
+    std::locale const & loc = std::locale())
+{
+    return std::search( haystack.begin(), haystack.end(),
+        needle.begin(), needle.end(), my_equal<typename T::value_type>(loc) );
+}
+
+/// Find substring (case insensitive)
+/**
+ * @todo Is this still used? This method may not make sense.. should use
+ * iterators or be less generic. As is it is too tightly coupled to std::string
+ *
+ * @param [in] haystack The string to search in
+ * @param [in] needle The string to search for as a char array of values
+ * @param [in] size Length of needle
+ * @param [in] loc The locale to use for determining the case of values.
+ *             Defaults to the current locale.
+ * @return An iterator to the first element of the first occurrance of needle in
+ *         haystack. If the sequence is not found, the function returns
+ *         haystack.end()
+ */
+template<typename T>
+typename T::const_iterator ci_find_substr(T const & haystack,
+    typename T::value_type const * needle, typename T::size_type size,
+    std::locale const & loc = std::locale())
+{
+    return std::search( haystack.begin(), haystack.end(),
+        needle, needle+size, my_equal<typename T::value_type>(loc) );
+}
+
+/// Convert a string to lowercase
+/**
+ * @param [in] in The string to convert
+ * @return The converted string
+ */
+std::string to_lower(std::string const & in);
+
+/// Replace all occurrances of a substring with another
+/**
+ * @param [in] subject The string to search in
+ * @param [in] search The string to search for
+ * @param [in] replace The string to replace with
+ * @return A copy of `subject` with all occurances of `search` replaced with
+ *         `replace`
+ */
+std::string string_replace_all(std::string subject, std::string const & search,
+                               std::string const & replace);
+
+/// Convert std::string to ascii printed string of hex digits
+/**
+ * @param [in] input The string to print
+ * @return A copy of `input` converted to the printable representation of the
+ *         hex values of its data.
+ */
+std::string to_hex(std::string const & input);
+
+/// Convert byte array (uint8_t) to ascii printed string of hex digits
+/**
+ * @param [in] input The byte array to print
+ * @param [in] length The length of input
+ * @return A copy of `input` converted to the printable representation of the
+ *         hex values of its data.
+ */
+std::string to_hex(uint8_t const * input, size_t length);
+
+/// Convert char array to ascii printed string of hex digits
+/**
+ * @param [in] input The char array to print
+ * @param [in] length The length of input
+ * @return A copy of `input` converted to the printable representation of the
+ *         hex values of its data.
+ */
+std::string to_hex(char const * input, size_t length);
+
+} // namespace utility
+} // namespace websocketpp
+
+#include <websocketpp/impl/utilities_impl.hpp>
+
+#endif // WEBSOCKETPP_UTILITIES_HPP
diff --git a/vendor/websocketpp/websocketpp/version.hpp b/vendor/websocketpp/websocketpp/version.hpp
new file mode 100644
index 0000000..b88cc11
--- /dev/null
+++ b/vendor/websocketpp/websocketpp/version.hpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the WebSocket++ Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+#ifndef WEBSOCKETPP_VERSION_HPP
+#define WEBSOCKETPP_VERSION_HPP
+
+/// Namespace for the WebSocket++ project
+namespace websocketpp {
+
+/*
+ other places where version information is kept
+ - readme.md
+ - changelog.md
+ - Doxyfile
+ - CMakeLists.txt
+*/
+
+/// Library major version number
+static int const major_version = 0;
+/// Library minor version number
+static int const minor_version = 7;
+/// Library patch version number
+static int const patch_version = 0;
+/// Library pre-release flag
+/**
+ * This is a textual flag indicating the type and number for pre-release
+ * versions (dev, alpha, beta, rc). This will be blank for release versions.
+ */
+
+static char const prerelease_flag[] = "";
+
+/// Default user agent string
+static char const user_agent[] = "WebSocket++/0.7.0";
+
+} // namespace websocketpp
+
+#endif // WEBSOCKETPP_VERSION_HPP

From 94b046dce6bb86fd22abd1831fc9056103f4aa5d Mon Sep 17 00:00:00 2001
From: pbattu123 <p.battu@pbsa.info>
Date: Wed, 22 May 2019 16:33:40 +0000
Subject: [PATCH 108/108] commit cmake for cmakehelpers

---
 vendor/websocketpp/cmake/CMakeHelpers.cmake | 109 ++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 vendor/websocketpp/cmake/CMakeHelpers.cmake

diff --git a/vendor/websocketpp/cmake/CMakeHelpers.cmake b/vendor/websocketpp/cmake/CMakeHelpers.cmake
new file mode 100644
index 0000000..c2a20e5
--- /dev/null
+++ b/vendor/websocketpp/cmake/CMakeHelpers.cmake
@@ -0,0 +1,109 @@
+
+# Print build configuration
+macro (print_used_build_config)
+    message ("\n=========== Used Build Configuration =============\n")
+    message (STATUS "ENABLE_CPP11        = " ${ENABLE_CPP11})
+    message (STATUS "BUILD_EXAMPLES      = " ${BUILD_EXAMPLES})
+    message (STATUS "BUILD_TESTS         = " ${BUILD_TESTS})
+    message ("")
+    message (STATUS "WEBSOCKETPP_ROOT    = " ${WEBSOCKETPP_ROOT})
+    message (STATUS "WEBSOCKETPP_BIN     = " ${WEBSOCKETPP_BIN})
+    message (STATUS "WEBSOCKETPP_LIB     = " ${WEBSOCKETPP_LIB})
+    message (STATUS "Install prefix      = " ${CMAKE_INSTALL_PREFIX})
+    message ("")
+    message (STATUS "WEBSOCKETPP_BOOST_LIBS        = ${WEBSOCKETPP_BOOST_LIBS}")
+    message (STATUS "WEBSOCKETPP_PLATFORM_LIBS     = ${WEBSOCKETPP_PLATFORM_LIBS}")
+    message (STATUS "WEBSOCKETPP_PLATFORM_TLS_LIBS = ${WEBSOCKETPP_PLATFORM_TLS_LIBS}")
+    message ("") 
+    message (STATUS "OPENSSL_FOUND        = ${OPENSSL_FOUND}")
+    message (STATUS "OPENSSL_INCLUDE_DIR     = ${OPENSSL_INCLUDE_DIR}")
+    message (STATUS "OPENSSL_LIBRARIES = ${OPENSSL_LIBRARIES}")
+    message (STATUS "OPENSSL_VERSION = ${OPENSSL_VERSION}")
+    message ("") 
+endmacro ()
+
+# Adds the given folder_name into the source files of the current project. 
+# Use this macro when your module contains .cpp and .h files in several subdirectories.
+# Your sources variable needs to be WSPP_SOURCE_FILES and headers variable WSPP_HEADER_FILES.
+macro(add_source_folder folder_name)
+    file(GLOB H_FILES_IN_FOLDER_${folder_name} ${folder_name}/*.hpp ${folder_name}/*.h)
+    file(GLOB CPP_FILES_IN_FOLDER_${folder_name} ${folder_name}/*.cpp ${folder_name}/*.c)
+    source_group("Header Files\\${folder_name}" FILES ${H_FILES_IN_FOLDER_${folder_name}})
+    source_group("Source Files\\${folder_name}" FILES ${CPP_FILES_IN_FOLDER_${folder_name}})
+    set(WSPP_HEADER_FILES ${WSPP_HEADER_FILES} ${H_FILES_IN_FOLDER_${folder_name}})
+    set(WSPP_SOURCE_FILES ${WSPP_SOURCE_FILES} ${CPP_FILES_IN_FOLDER_${folder_name}})
+endmacro()
+
+# Initialize target.
+macro (init_target NAME)
+    set (TARGET_NAME ${NAME})
+    message ("** " ${TARGET_NAME})
+
+    # Include our own module path. This makes #include "x.h" 
+    # work in project subfolders to include the main directory headers.
+    include_directories (${CMAKE_CURRENT_SOURCE_DIR})
+endmacro ()
+
+# Build executable for executables
+macro (build_executable TARGET_NAME)
+    set (TARGET_LIB_TYPE "EXECUTABLE")
+    message (STATUS "-- Build Type:")
+    message (STATUS "       " ${TARGET_LIB_TYPE})
+
+    add_executable (${TARGET_NAME} ${ARGN})
+
+    include_directories (${WEBSOCKETPP_ROOT} ${WEBSOCKETPP_INCLUDE})
+
+    target_link_libraries(${TARGET_NAME} ${WEBSOCKETPP_PLATFORM_LIBS})
+
+    set_target_properties (${TARGET_NAME} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${WEBSOCKETPP_BIN})
+    set_target_properties (${TARGET_NAME} PROPERTIES DEBUG_POSTFIX d)
+endmacro ()
+
+# Build executable and register as test
+macro (build_test TARGET_NAME)
+    build_executable (${TARGET_NAME} ${ARGN})
+
+    if (${CMAKE_VERSION} VERSION_LESS 3)
+        message(WARNING "CMake too old to register ${TARGET_NAME} as a test")
+    else ()
+        add_test(NAME ${TARGET_NAME} COMMAND $<TARGET_FILE:${TARGET_NAME}>)
+    endif ()
+endmacro ()
+
+# Finalize target for all types
+macro (final_target)
+    if ("${TARGET_LIB_TYPE}" STREQUAL "EXECUTABLE")
+        install (TARGETS ${TARGET_NAME} 
+                 RUNTIME DESTINATION "bin" 
+                 CONFIGURATIONS ${CMAKE_CONFIGURATION_TYPES})
+    endif ()
+
+    # install headers, directly from current source dir and look for subfolders with headers
+    file (GLOB_RECURSE TARGET_INSTALL_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.hpp)
+    foreach (hppfile ${TARGET_INSTALL_HEADERS})
+      get_filename_component (currdir ${hppfile} PATH)
+      install (FILES ${hppfile} DESTINATION "include/${TARGET_NAME}/${currdir}")
+    endforeach()
+endmacro ()
+
+macro (link_boost)
+    target_link_libraries (${TARGET_NAME} ${Boost_LIBRARIES})
+endmacro ()
+
+macro (link_openssl)
+    target_link_libraries (${TARGET_NAME} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+endmacro ()
+
+macro (link_zlib)
+	target_link_libraries (${TARGET_NAME} ${ZLIB_LIBRARIES})
+endmacro ()
+
+macro (include_subdirs PARENT)
+    file (GLOB SDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PARENT}/*")
+    foreach (SUBDIR ${SDIRS})
+        if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/CMakeLists.txt")
+            add_subdirectory ("${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}")
+        endif ()
+    endforeach ()
+endmacro()