Merge branch 'master' into tutorials

.gitignore

@@ -32,15 +32,11 @@ install_manifest.txt
 *.ncb
 */Debug/*
 */*/Debug/*
-bin/Debug
 */Release/*
 */*/Release/*
 */RelWithDebInfo/*
 */*/RelWithDebInfo/*
 
-# explicitly allow this path with /debug/ in it
-!websocketpp/transport/debug/*
-
 objs_shared/
 objs_static/
 
@@ -82,9 +78,3 @@ examples/wsperf/wsperf_client
 *.out
 
 *.log
-*.opensdf
-*.sdf
-*.vcxproj
-*.vcxproj.filters
-*.user
-install

.travis.yml

@@ -14,7 +14,6 @@ branches:
     - permessage-deflate
     - experimental
     - 0.3.x-cmake
-    - develop
 notifications:
   recipients:
     - travis@zaphoyd.com

CMakeLists.txt

@@ -9,7 +9,7 @@ project (websocketpp)
 cmake_minimum_required (VERSION 2.6)
 
 set (WEBSOCKETPP_MAJOR_VERSION 0)
-set (WEBSOCKETPP_MINOR_VERSION 5)
+set (WEBSOCKETPP_MINOR_VERSION 3)
 set (WEBSOCKETPP_PATCH_VERSION 0)
 set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
 
@@ -87,14 +87,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
 
     # 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()
+        add_definitions (-D_WEBSOCKETPP_CPP11_STL_)
     endif ()
 
     # Visual studio
@@ -113,7 +106,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
         set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
         set (WEBSOCKETPP_PLATFORM_TSL_LIBS ssl crypto)
         set (WEBSOCKETPP_BOOST_LIBS system thread)
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+        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 ()

COPYING

@@ -1,6 +1,6 @@
 Main Library:
 
-Copyright (c) 2014, Peter Thorson. All rights reserved.
+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:

Doxyfile

@@ -33,7 +33,7 @@ PROJECT_NAME           = "websocketpp"
 # if some version control system is used.
 
 
-PROJECT_NUMBER         = "0.5.0"
+PROJECT_NUMBER         = "0.3.0-alpha4"
 
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
@@ -974,7 +974,7 @@ HTML_COLORSTYLE_GAMMA  = 148
 # 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.
 
-HTML_TIMESTAMP         = NO
+HTML_TIMESTAMP         = YES
 
 # 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

SConstruct

@@ -101,27 +101,12 @@ 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
@@ -147,7 +132,7 @@ env.Append(CPPPATH = ['#'])
 
 ##### Set up C++11 environment
 polyfill_libs = [] # boost libraries used as drop in replacements for incomplete
-                   # C++11 STL implementations
+				   # C++11 STL implementations
 env_cpp11 = env.Clone ()
 
 if env_cpp11['CXX'].startswith('g++'):
@@ -180,18 +165,18 @@ else:
 # 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'])
+	env.Append(CPPFLAGS = '-isystem ' + env['BOOST_INCLUDES'])
 else:
-    env.Append(CPPPATH = [env['BOOST_INCLUDES']])
+	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'])
+	env_cpp11.Append(CPPFLAGS = '-isystem ' + env_cpp11['BOOST_INCLUDES'])
 else:
-    env_cpp11.Append(CPPPATH = [env_cpp11['BOOST_INCLUDES']])
+	env_cpp11.Append(CPPPATH = [env_cpp11['BOOST_INCLUDES']])
 env_cpp11.Append(LIBPATH = [env_cpp11['BOOST_LIBS']])
 
 releasedir = 'build/release/'
@@ -229,7 +214,6 @@ echo_server = SConscript('#/examples/echo_server/SConscript',variant_dir = build
 # 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)
@@ -252,9 +236,6 @@ debug_server = SConscript('#/examples/debug_server/SConscript',variant_dir = bui
 # 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)
-
 if not env['PLATFORM'].startswith('win'):
     # iostream_server
     iostream_server = SConscript('#/examples/iostream_server/SConscript',variant_dir = builddir + 'iostream_server',duplicate = 0)

changelog.md

@@ -1,93 +1,4 @@
 HEAD
-
-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.
@@ -106,9 +17,6 @@ HEAD
 - 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
@@ -217,7 +125,7 @@ HEAD
 - 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
+  implimentation 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

docs/simple_broadcast_server.cpp

@@ -36,7 +36,7 @@ public:
 
     void run(uint16_t port) {
         m_server.listen(port);
-        m_server.start_accept();
+	    m_server.start_accept();
         m_server.run();
     }
 private:

docs/simple_count_server_thread.cpp

@@ -46,7 +46,7 @@ public:
     
     void run(uint16_t port) {
         m_server.listen(port);
-        m_server.start_accept();
+	    m_server.start_accept();
         m_server.run();
     }
 private:

examples/broadcast_server/broadcast_server.cpp

@@ -3,7 +3,6 @@
 #include <websocketpp/server.hpp>
 
 #include <iostream>
-#include <set>
 
 /*#include <boost/thread.hpp>
 #include <boost/thread/mutex.hpp>
@@ -60,13 +59,17 @@ public:
         m_server.listen(port);
 
         // Start the server accept loop
-        m_server.start_accept();
+	    m_server.start_accept();
 
-        // Start the ASIO io_service run loop
+	    // Start the ASIO io_service run loop
         try {
             m_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;
         }
     }
 
@@ -127,7 +130,7 @@ public:
         }
     }
 private:
-    typedef std::set<connection_hdl,std::owner_less<connection_hdl> > con_list;
+    typedef std::set<connection_hdl,std::owner_less<connection_hdl>> con_list;
 
     server m_server;
     con_list m_connections;
@@ -139,18 +142,18 @@ private:
 };
 
 int main() {
-    try {
-    broadcast_server server_instance;
+	try {
+	broadcast_server server_instance;
 
-    // Start a thread to run the processing loop
-    thread t(bind(&broadcast_server::process_messages,&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);
+	// Run the asio loop with the main thread
+	server_instance.run(9002);
 
-    t.join();
+	t.join();
 
-    } catch (websocketpp::exception const & e) {
-        std::cout << e.what() << std::endl;
-    }
+	} catch (std::exception & e) {
+	    std::cout << e.what() << std::endl;
+	}
 }

examples/debug_client/debug_client.cpp

@@ -36,7 +36,7 @@
 #include <iostream>
 #include <chrono>
 
-typedef websocketpp::client<websocketpp::config::asio_client> client;
+typedef websocketpp::client<websocketpp::config::asio_tls_client> client;
 
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
@@ -63,11 +63,10 @@ public:
 
         // 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_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) {
@@ -75,30 +74,29 @@ public:
         client::connection_ptr con = m_endpoint.get_connection(uri, ec);
 
         if (ec) {
-            m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
+        	m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
         }
 
         //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();
+	    // 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) {
+    void on_socket_init(websocketpp::connection_hdl hdl) {
         m_socket_init = std::chrono::high_resolution_clock::now();
     }
 
-    context_ptr on_tls_init(websocketpp::connection_hdl) {
+    context_ptr on_tls_init(websocketpp::connection_hdl 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);
+        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);
         } catch (std::exception& e) {
             std::cout << e.what() << std::endl;
@@ -106,27 +104,15 @@ public:
         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) {
+    void on_message(websocketpp::connection_hdl hdl, message_ptr msg) {
         m_message = std::chrono::high_resolution_clock::now();
         m_endpoint.close(hdl,websocketpp::close::status::going_away,"");
     }
-    void on_close(websocketpp::connection_hdl) {
+    void on_close(websocketpp::connection_hdl 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;
@@ -147,13 +133,13 @@ private:
 };
 
 int main(int argc, char* argv[]) {
-    std::string uri = "wss://echo.websocket.org";
+	std::string uri = "wss://echo.websocket.org";
 
-    if (argc == 2) {
-        uri = argv[1];
-    }
+	if (argc == 2) {
+	    uri = argv[1];
+	}
 
-    try {
+	try {
         perftest endpoint;
         endpoint.start(uri);
     } catch (const std::exception & e) {

examples/debug_server/debug_server.cpp

@@ -31,60 +31,11 @@
 
 #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;
+typedef websocketpp::server<websocketpp::config::debug_asio> server;
 
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
@@ -93,33 +44,6 @@ 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()
@@ -135,10 +59,10 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
 }
 
 int main() {
-    // Create a server endpoint
+	// Create a server endpoint
     server echo_server;
 
-    try {
+	try {
         // Set logging settings
         echo_server.set_access_channels(websocketpp::log::alevel::all);
         echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
@@ -150,19 +74,13 @@ int main() {
         // 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
+	    // Start the ASIO io_service run loop
         echo_server.run();
     } catch (const std::exception & e) {
         std::cout << e.what() << std::endl;

examples/dev/main.cpp

@@ -1,5 +1,5 @@
 //#ifndef _WEBSOCKETPP_CPP11_STL_
-//    #define _WEBSOCKETPP_CPP11_STL_
+//	#define _WEBSOCKETPP_CPP11_STL_
 //#endif
 
 #include <random>
@@ -24,177 +24,177 @@
 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;
-    }
+	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 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_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_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_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;
-    }
+	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;
+	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>();
+	con_msg_man_type::ptr manager(new con_msg_man_type());
 
-    size_t foo = 1024;
+	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;
+	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;
+	std::random_device dev;
 
 
 
-    key.i = 0x12345678;
+	key.i = 0x12345678;
 
-    double m = 18094238402394.0824923;
+	double m = 18094238402394.0824923;
 
-    /*std::cout << "Some Math" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
+	/*std::cout << "Some Math" << std::endl;
+	{
+		boost::timer::auto_cpu_timer t;
 
-        for (int i = 0; i < foo; i++) {
-            m /= 1.001;
-        }
+		for (int i = 0; i < foo; i++) {
+			m /= 1.001;
+		}
 
-    }*/
+	}*/
 
-    std::cout << m << std::endl;
+	std::cout << m << std::endl;
 
-    std::cout << "Random Gen" << std::endl;
-    {
-        boost::timer::auto_cpu_timer t;
+	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');
-    }
+		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;
+	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);
-    }
+		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;
+	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');
+	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;
+	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);
-    }
+		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;
+	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;
+	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);
-    }
+		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;
+	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;
+	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);
-    }
+		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;
+	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;
+	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::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;
+	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::handler::ptr h(new handler());
 
-    server test_server(h);
-    server::connection_ptr con;
+	server test_server(h);
+	server::connection_ptr con;
 
-    std::stringstream output;
+	std::stringstream output;
 
-    test_server.register_ostream(&output);
+	test_server.register_ostream(&output);
 
-    con = test_server.get_connection();
+	con = test_server.get_connection();
 
-    con->start();
+	con->start();
 
-    //foo.handle_accept(con,true);
+	//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 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 input2;
+	input2 << "messageabc2";
+	input2 >> *con;
 
-    std::stringstream input3;
-    input3 << "messageabc3";
-    input3 >> *con;
+	std::stringstream input3;
+	input3 << "messageabc3";
+	input3 >> *con;
 
-    std::stringstream input4;
-    input4 << "close";
-    input4 >> *con;
+	std::stringstream input4;
+	input4 << "close";
+	input4 >> *con;
 
-    std::cout << "connection output:" << std::endl;
-    std::cout << output.str() << std::endl;*/
+	std::cout << "connection output:" << std::endl;
+	std::cout << output.str() << std::endl;*/
 }

examples/echo_server/echo_handler.hpp

@@ -29,9 +29,9 @@
 #define WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
 
 class echo_handler : public server::handler {
-    void on_message(connection_ptr con, std::string msg) {
-        con->write(msg);
-    }
+	void on_message(connection_ptr con, std::string msg) {
+		con->write(msg);
+	}
 };
 
 #endif // WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP

examples/echo_server/echo_server.cpp

@@ -28,10 +28,10 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
 }
 
 int main() {
-    // Create a server endpoint
+	// Create a server endpoint
     server echo_server;
 
-    try {
+	try {
         // Set logging settings
         echo_server.set_access_channels(websocketpp::log::alevel::all);
         echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
@@ -48,10 +48,12 @@ int main() {
         // Start the server accept loop
         echo_server.start_accept();
 
-        // Start the ASIO io_service run loop
+	    // Start the ASIO io_service run loop
         echo_server.run();
-    } catch (websocketpp::exception const & e) {
+    } 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;
     }

examples/echo_server_both/CMakeLists.txt

@@ -1,15 +0,0 @@
-
-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 ()
-endif()

examples/echo_server_both/SConscript

@@ -1,24 +0,0 @@
-## 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')

examples/echo_server_both/echo_server_both.cpp

@@ -1,87 +0,0 @@
-#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();
-}

examples/echo_server_both/server.pem

@@ -1,58 +0,0 @@
------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-----

examples/echo_server_tls/echo_handler_tls.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ * 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:
@@ -24,31 +24,14 @@
  * 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>
+#ifndef WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
+#define WEBSOCKETPP_ECHO_SERVER_HANDLER_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);
-}
+class echo_handler : public server::handler {
+	void on_message(connection_ptr con, std::string msg) {
+		con->write(msg);
+	}
+};
 
+#endif // WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP

examples/echo_server_tls/echo_server_tls.cpp

@@ -33,12 +33,11 @@ std::string get_password() {
 
 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 = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
+    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");
@@ -51,23 +50,23 @@ context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
 
 int main() {
     // Create a server endpoint
-    server echo_server;
+	server echo_server;
 
     // Initialize ASIO
-    echo_server.init_asio();
+	echo_server.init_asio();
 
     // Register our message handler
     echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
     echo_server.set_tls_init_handler(bind(&on_tls_init,::_1));
 
 
-    // Listen on port 9002
-    echo_server.listen(9002);
+	// Listen on port 9002
+	echo_server.listen(9002);
 
-    // Start the server accept loop
-    echo_server.start_accept();
+	// Start the server accept loop
+	echo_server.start_accept();
 
-    // Start the ASIO io_service run loop
-    echo_server.run();
+	// Start the ASIO io_service run loop
+	echo_server.run();
 
 }

examples/iostream_server/iostream_server.cpp

@@ -18,17 +18,17 @@ typedef server::message_ptr message_ptr;
 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());
+                	"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()));
+                	"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());
+                	"Echo Failed: "+e.message());
     }
 }
 
@@ -36,7 +36,7 @@ int main() {
     server s;
     std::ofstream log;
 
-    try {
+	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);
@@ -82,8 +82,12 @@ int main() {
             }
             con->eof();
         }
-    } catch (websocketpp::exception const & e) {
+    } 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;
     }
     log.close();
 }

examples/print_server/print_server.cpp

@@ -5,7 +5,7 @@
 
 typedef websocketpp::server<websocketpp::config::asio> server;
 
-void on_message(websocketpp::connection_hdl, server::message_ptr msg) {
+void on_message(websocketpp::connection_hdl hdl, server::message_ptr msg) {
         std::cout << msg->get_payload() << std::endl;
 }
 

examples/sip_client/sip_client.cpp

@@ -43,13 +43,13 @@ void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
 
 int main(int argc, char* argv[]) {
 
-    std::string uri = "ws://localhost:9001";
+	std::string uri = "ws://localhost:9001";
 
-    if (argc == 2) {
-        uri = argv[1];
-    }
+	if (argc == 2) {
+	    uri = argv[1];
+	}
 
-    try {
+	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);
@@ -69,7 +69,7 @@ int main(int argc, char* argv[]) {
 
         sip_client.connect(con);
 
-        // Start the ASIO io_service run loop
+	    // Start the ASIO io_service run loop
         sip_client.run();
 
         while(!received) {
@@ -78,7 +78,11 @@ int main(int argc, char* argv[]) {
 
         std::cout << "done" << std::endl;
 
-    } catch (websocketpp::exception const & e) {
+    } 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;
     }
 }

examples/subprotocol_server/subprotocol_server.cpp

@@ -42,7 +42,11 @@ int main() {
         s.start_accept();
 
         s.run();
-    } catch (websocketpp::exception const & e) {
+    } 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;
     }
 }

examples/telemetry_client/telemetry_client.cpp

@@ -37,13 +37,13 @@ public:
 
     // This method will block until the connection is complete
     void run(const std::string & uri) {
-        // Create a new connection to the given 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;
+        	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
@@ -65,7 +65,7 @@ public:
     }
 
     // The open handler will signal that we are ready to start sending telemetry
-    void on_open(websocketpp::connection_hdl) {
+    void on_open(websocketpp::connection_hdl hdl) {
         m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection opened, starting telemetry!");
 
@@ -74,7 +74,7 @@ public:
     }
 
     // The close handler will signal that we should stop sending telemetry
-    void on_close(websocketpp::connection_hdl) {
+    void on_close(websocketpp::connection_hdl hdl) {
         m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection closed, stopping telemetry!");
 
@@ -83,7 +83,7 @@ public:
     }
 
     // The fail handler will signal that we should stop sending telemetry
-    void on_fail(websocketpp::connection_hdl) {
+    void on_fail(websocketpp::connection_hdl hdl) {
         m_client.get_alog().write(websocketpp::log::alevel::app,
             "Connection failed, stopping telemetry!");
 
@@ -128,7 +128,7 @@ public:
             // 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());
+                	"Send Error: "+ec.message());
                 break;
             }
 

examples/telemetry_server/CMakeLists.txt

@@ -1,10 +0,0 @@
-
-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 ()

examples/telemetry_server/SConscript

@@ -1,23 +0,0 @@
-## 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')

examples/telemetry_server/index.html

@@ -1,85 +0,0 @@
-<!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>

examples/telemetry_server/telemetry_server.cpp

@@ -1,204 +0,0 @@
-#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;
-    typedef websocketpp::lib::lock_guard<websocketpp::lib::mutex> scoped_lock;
-
-    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_uri()->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;
-}

examples/testee_client/testee_client.cpp

@@ -28,16 +28,16 @@ void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) {
 }
 
 int main(int argc, char* argv[]) {
-    // Create a server endpoint
+	// Create a server endpoint
     client c;
 
-    std::string uri = "ws://localhost:9001";
+	std::string uri = "ws://localhost:9001";
 
-    if (argc == 2) {
-        uri = argv[1];
-    }
+	if (argc == 2) {
+	    uri = argv[1];
+	}
 
-    try {
+	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);
@@ -52,7 +52,7 @@ int main(int argc, char* argv[]) {
         client::connection_ptr con = c.get_connection(uri+"/getCaseCount", ec);
         c.connect(con);
 
-        // Start the ASIO io_service run loop
+	    // Start the ASIO io_service run loop
         c.run();
 
         std::cout << "case count: " << case_count << std::endl;
@@ -74,7 +74,11 @@ int main(int argc, char* argv[]) {
 
         std::cout << "done" << std::endl;
 
-    } catch (websocketpp::exception const & e) {
+    } 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;
     }
 }

examples/testee_server/testee_server.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -45,7 +45,7 @@ struct testee_config : public websocketpp::config::asio {
     typedef core::rng_type rng_type;
     typedef core::endpoint_base endpoint_base;
 
-    static bool const enable_multithreading = true;
+    static bool const enable_multithreading = false;
 
     struct transport_config : public core::transport_config {
         typedef core::concurrency_type concurrency_type;
@@ -54,7 +54,7 @@ struct testee_config : public websocketpp::config::asio {
         typedef core::request_type request_type;
         typedef core::response_type response_type;
 
-        static bool const enable_multithreading = true;
+        static bool const enable_multithreading = false;
     };
 
     typedef websocketpp::transport::asio::endpoint<transport_config>
@@ -80,7 +80,7 @@ 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) {
+void on_socket_init(websocketpp::connection_hdl hdl, boost::asio::ip::tcp::socket & s) {
     boost::asio::ip::tcp::no_delay option(true);
     s.set_option(option);
 }
@@ -104,7 +104,6 @@ int main(int argc, char * argv[]) {
 
         // 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));
@@ -124,7 +123,7 @@ int main(int argc, char * argv[]) {
             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));
+                ts.push_back(thread_ptr(new websocketpp::lib::thread(&server::run, &testee_server)));
             }
 
             for (size_t i = 0; i < num_threads; i++) {
@@ -132,7 +131,11 @@ int main(int argc, char * argv[]) {
             }
         }
 
-    } catch (websocketpp::exception const & e) {
+    } catch (const std::exception & e) {
         std::cout << "exception: " << e.what() << std::endl;
+    } catch (websocketpp::lib::error_code e) {
+        std::cout << "error code: " << e.message() << std::endl;
+    } catch (...) {
+        std::cout << "other exception" << std::endl;
     }
 }

examples/utility_client/utility_client.cpp

@@ -79,14 +79,6 @@ public:
         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;
     }
@@ -99,10 +91,6 @@ public:
         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;
@@ -111,20 +99,13 @@ private:
     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";
-    }
+        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
 
     return out;
 }
@@ -138,7 +119,7 @@ public:
         m_endpoint.init_asio();
         m_endpoint.start_perpetual();
 
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
     }
 
     ~websocket_endpoint() {
@@ -174,7 +155,7 @@ public:
         }
 
         int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
+        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(
@@ -195,12 +176,6 @@ public:
             &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);
 
@@ -222,24 +197,6 @@ public:
         }
     }
 
-    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()) {
@@ -273,7 +230,6 @@ int main() {
             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"
@@ -284,17 +240,6 @@ int main() {
             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);
             
@@ -307,7 +252,7 @@ int main() {
             std::getline(ss,reason);
             
             endpoint.close(id, close_code, reason);
-        } else if (input.substr(0,4) == "show") {
+        }  else if (input.substr(0,4) == "show") {
             int id = atoi(input.substr(5).c_str());
 
             connection_metadata::ptr metadata = endpoint.get_metadata(id);

readme.md

@@ -1,4 +1,4 @@
-WebSocket++ (0.5.0)
+WebSocket++ (0.3.0-alpha4)
 ==========================
 
 WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket

roadmap.md

@@ -16,23 +16,24 @@ Complete & Tested:
 - open_handler
 - close_handler
 - echo_server & echo_server_tls
-- External io_service support
+
+Implemented, needs more testing
 - TLS support
-- exception/error handling
-- Timeouts
-- Subprotocol negotiation
-- validate_handler
-- Hybi 00/Hixie 76 legacy protocol support
-- Outgoing Proxy Support
+- External io_service support
 - socket_init_handler
 - tls_init_handler
 - tcp_init_handler
-
-Ongoing work
+- exception/error handling
+- Subprotocol negotiation
+- Hybi 00/Hixie 76 legacy protocol support
 - Performance tuning
+- Outgoing Proxy Support
 - PowerPC support
 - Visual Studio / Windows support
+- Timeouts
 - CMake build/install support
+
+- validate_handler
 - http_handler
 
 Future feature roadmap

test/connection/connection.cpp

@@ -30,10 +30,6 @@
 
 #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
@@ -41,9 +37,9 @@
 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(websocketpp::user_agent)+"\r\n\r\n";
 
-    std::string o2 = run_server_test(input);
+	std::string o2 = run_server_test(input);
 
     BOOST_CHECK(o2 == output);
 }
@@ -83,67 +79,16 @@ struct stub_config : public websocketpp::config::core {
     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::alog_type alog;
     stub_config::elog_type elog;
-    stub_config::rng_type rng;
-    websocketpp::connection<stub_config> c;
+	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());
 }*/
@@ -167,29 +112,6 @@ void http_func(server* s, websocketpp::connection_hdl hdl) {
     con->set_status(websocketpp::http::status_code::ok);
 }
 
-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);
 
@@ -205,8 +127,8 @@ BOOST_AUTO_TEST_CASE( basic_websocket_request ) {
     output+=websocketpp::user_agent;
     output+="\r\nUpgrade: websocket\r\n\r\n";
 
-    server s;
-    s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+	server s;
+	s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
 
     BOOST_CHECK(run_server_test(s,input) == output);
 }
@@ -217,8 +139,8 @@ BOOST_AUTO_TEST_CASE( http_request ) {
     output+=websocketpp::user_agent;
     output+="\r\n\r\n/foo/bar";
 
-    server s;
-    s.set_http_handler(bind(&http_func,&s,::_1));
+	server s;
+	s.set_http_handler(bind(&http_func,&s,::_1));
 
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
@@ -227,9 +149,9 @@ 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));
+	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);
 }
@@ -238,10 +160,10 @@ 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));
+	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);
 }
@@ -251,21 +173,21 @@ BOOST_AUTO_TEST_CASE( basic_client_websocket ) {
 
     //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::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;
+	std::stringstream output;
 
-    client e;
-    e.set_access_channels(websocketpp::log::alevel::none);
+	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);
+	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);
+	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());
 }
@@ -285,88 +207,14 @@ BOOST_AUTO_TEST_CASE( set_max_message_size ) {
     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));
+	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
@@ -383,96 +231,11 @@ BOOST_AUTO_TEST_CASE( user_reject_origin ) {
 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);
+	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**";
+	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));
-}
-
-

test/connection/connection_tu2.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -31,32 +31,27 @@ 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) {
+std::string run_server_test(std::string input) {
     server test_server;
-    return run_server_test(test_server,input,log);
+    return run_server_test(test_server,input);
 }
 
-std::string run_server_test(server & s, std::string input, bool log) {
+std::string run_server_test(server & s, std::string input) {
     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.clear_access_channels(websocketpp::log::alevel::all);
+    s.clear_error_channels(websocketpp::log::elevel::all);
 
-    s.register_ostream(&output);
+	s.register_ostream(&output);
 
-    con = s.get_connection();
-    con->start();
+	con = s.get_connection();
+	con->start();
 
-    std::stringstream channel;
+	std::stringstream channel;
 
-    channel << input;
-    channel >> *con;
+	channel << input;
+	channel >> *con;
 
-    return output.str();
+	return output.str();
 }

test/connection/connection_tu2.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -30,7 +30,6 @@
 
 // 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>
@@ -47,5 +46,5 @@ 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);
+std::string run_server_test(std::string input);
+std::string run_server_test(server & s, std::string input);

test/endpoint/endpoint.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ * 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:
@@ -94,33 +94,8 @@ struct stub_config : public websocketpp::config::core {
 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.extension_value == 5 );
+    BOOST_CHECK( 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);
+    BOOST_CHECK( s.is_server() == true );
 }

test/http/parser.cpp

@@ -28,7 +28,6 @@
 #define BOOST_TEST_MODULE http_parser
 #include <boost/test/unit_test.hpp>
 
-#include <iostream>
 #include <string>
 
 #include <websocketpp/http/request.hpp>
@@ -55,24 +54,24 @@ BOOST_AUTO_TEST_CASE( is_token_char ) {
 
     // numbers
     for (int i = 0x30; i < 0x3a; i++) {
-        BOOST_CHECK( websocketpp::http::is_token_char((unsigned char)(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)) );
+    	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)) );
+    	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)) );
+    	BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
     }
 
     // misc
@@ -96,7 +95,7 @@ BOOST_AUTO_TEST_CASE( 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)) );
+    	BOOST_CHECK( !websocketpp::http::is_token_char((unsigned char)(i)) );
     }
 
     // is not
@@ -413,9 +412,9 @@ BOOST_AUTO_TEST_CASE( blank_consume ) {
     bool exception = false;
 
     try {
-        r.consume(raw.c_str(),raw.size());
+    	r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -430,9 +429,9 @@ BOOST_AUTO_TEST_CASE( blank_request ) {
     bool exception = false;
 
     try {
-        r.consume(raw.c_str(),raw.size());
+    	r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == true );
@@ -447,9 +446,9 @@ BOOST_AUTO_TEST_CASE( bad_request_no_host ) {
     bool exception = false;
 
     try {
-        r.consume(raw.c_str(),raw.size());
+    	r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == true );
@@ -465,10 +464,10 @@ BOOST_AUTO_TEST_CASE( basic_request ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
+    	exception = true;
+    	std::cout << e.what() << std::endl;
     }
 
     BOOST_CHECK( exception == false );
@@ -480,62 +479,6 @@ BOOST_AUTO_TEST_CASE( basic_request ) {
     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;
 
@@ -545,9 +488,9 @@ BOOST_AUTO_TEST_CASE( trailing_body_characters ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -569,11 +512,11 @@ BOOST_AUTO_TEST_CASE( basic_split1 ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(raw.c_str(),raw.size());
-        pos += r.consume(raw2.c_str(),raw2.size());
+    	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;
+    	exception = true;
+    	std::cout << e.what() << std::endl;
     }
 
     BOOST_CHECK( exception == false );
@@ -595,11 +538,11 @@ BOOST_AUTO_TEST_CASE( basic_split2 ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(raw.c_str(),raw.size());
-        pos += r.consume(raw2.c_str(),raw2.size());
+    	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;
+    	exception = true;
+    	std::cout << e.what() << std::endl;
     }
 
     BOOST_CHECK( exception == false );
@@ -620,11 +563,11 @@ BOOST_AUTO_TEST_CASE( max_header_len ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(raw.c_str(),raw.size());
+    	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;
-        }
+    	if (e.m_error_code == websocketpp::http::status_code::request_header_fields_too_large) {
+    		exception = true;
+    	}
     }
 
     BOOST_CHECK( exception == true );
@@ -640,38 +583,17 @@ BOOST_AUTO_TEST_CASE( max_header_len_split ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(raw.c_str(),raw.size());
-        pos += r.consume(raw2.c_str(),raw2.size());
+    	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;
-        }
+    	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;
 
@@ -681,9 +603,9 @@ BOOST_AUTO_TEST_CASE( firefox_full_request ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(raw.c_str(),raw.size());
+    	pos += r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -714,9 +636,9 @@ BOOST_AUTO_TEST_CASE( bad_method ) {
     bool exception = false;
 
     try {
-        r.consume(raw.c_str(),raw.size());
+    	r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == true );
@@ -730,9 +652,9 @@ BOOST_AUTO_TEST_CASE( bad_header_name ) {
     bool exception = false;
 
     try {
-        r.consume(raw.c_str(),raw.size());
+    	r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == true );
@@ -747,9 +669,9 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -770,9 +692,9 @@ BOOST_AUTO_TEST_CASE( new_http_version1 ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -793,9 +715,9 @@ BOOST_AUTO_TEST_CASE( new_http_version2 ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -818,9 +740,9 @@ BOOST_AUTO_TEST_CASE( new_http_version3 ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == true );
@@ -835,9 +757,9 @@ BOOST_AUTO_TEST_CASE( header_whitespace1 ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -858,9 +780,9 @@ BOOST_AUTO_TEST_CASE( header_whitespace2 ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -881,9 +803,9 @@ BOOST_AUTO_TEST_CASE( header_aggregation ) {
     size_t pos = 0;
 
     try {
-        pos = r.consume(raw.c_str(),raw.size());
+    	pos = r.consume(raw.c_str(),raw.size());
     } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -904,10 +826,10 @@ BOOST_AUTO_TEST_CASE( wikipedia_example_response ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(raw.c_str(),raw.size());
+    	pos += r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
+    	exception = true;
+    	std::cout << e.what() << std::endl;
     }
 
     BOOST_CHECK( exception == false );
@@ -931,10 +853,10 @@ BOOST_AUTO_TEST_CASE( response_with_non_standard_lws ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(raw.c_str(),raw.size());
+    	pos += r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
+    	exception = true;
+    	std::cout << e.what() << std::endl;
     }
 
     BOOST_CHECK( exception == false );
@@ -958,10 +880,10 @@ BOOST_AUTO_TEST_CASE( plain_http_response ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(raw.c_str(),raw.size());
+    	pos += r.consume(raw.c_str(),raw.size());
     } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
+    	exception = true;
+    	std::cout << e.what() << std::endl;
     }
 
     BOOST_CHECK( exception == false );
@@ -993,10 +915,10 @@ BOOST_AUTO_TEST_CASE( parse_istream ) {
     size_t pos = 0;
 
     try {
-        pos += r.consume(s);
+    	pos += r.consume(s);
     } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
+    	exception = true;
+    	std::cout << e.what() << std::endl;
     }
 
     BOOST_CHECK_EQUAL( exception, false );

test/http/parser_perf.cpp

@@ -31,111 +31,111 @@
 
 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;
+	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
+		//nanoseconds_per_test
 
-        //tests_per_second
+		//tests_per_second
 
-        //1000000000.0/(double(time_taken.count())/1000.0)
+		//1000000000.0/(double(time_taken.count())/1000.0)
 
-        std::cout << 1000000000.0/(double(time_taken.count())/1000.0) << std::endl;
+		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;
-    }
+		//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;
+	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 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 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 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";
+	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;
+	{
+		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;
-            }
+			try {
+				r.consume(raw.c_str(),raw.size());
+			} catch (...) {
+				std::cout << "exception" << std::endl;
+			}
 
-            if (!r.ready()) {
-                std::cout << "error" << std::endl;
-                break;
-            }
-        }
-    }
+			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;
+	{
+		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;
-            }
+			try {
+				r.consume2(firefox.c_str(),firefox.size());
+			} catch (...) {
+				std::cout << "exception" << std::endl;
+			}
 
-            if (!r.ready()) {
-                std::cout << "error" << std::endl;
-                break;
-            }
-        }
-    }
+			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;
+	{
+		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;
-            }
+			try {
+				r.consume(firefox.c_str(),firefox.size());
+			} catch (...) {
+				std::cout << "exception" << std::endl;
+			}
 
-            if (!r.ready()) {
-                std::cout << "error" << std::endl;
-                break;
-            }
-        }
-    }
+			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;
+	{
+		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;
-            }
+			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;
-            }
-        }
-    }
+			if (!r.ready()) {
+				std::cout << "error" << std::endl;
+				break;
+			}
+		}
+	}
 
-    return 0;
+	return 0;
 }

test/logger/basic.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

test/message_buffer/alloc.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -35,62 +35,62 @@
 
 template <template <class> class con_msg_manager>
 struct stub {
-    typedef websocketpp::lib::shared_ptr<stub> ptr;
+	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;
+	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) {}
+	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();
+	bool recycle() {
+		con_msg_man_ptr shared = m_manager.lock();
 
-        if (shared) {
-            return shared->recycle(this);
-        } else {
-            return false;
-        }
-    }
+		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;
+	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;
+	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);
+	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_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;
+	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);
+	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);
+	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);
 }
 

test/message_buffer/message.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -35,38 +35,38 @@
 
 template <typename message>
 struct stub {
-    typedef websocketpp::lib::weak_ptr<stub> weak_ptr;
-    typedef websocketpp::lib::shared_ptr<stub> ptr;
+	typedef websocketpp::lib::weak_ptr<stub> weak_ptr;
+	typedef websocketpp::lib::shared_ptr<stub> ptr;
 
-    stub() : recycled(false) {}
+	stub() : recycled(false) {}
 
-    bool recycle(message *) {
-        this->recycled = true;
-        return false;
-    }
+	bool recycle(message * msg) {
+		this->recycled = true;
+		return false;
+	}
 
-    bool recycled;
+	bool recycled;
 };
 
 BOOST_AUTO_TEST_CASE( basic_size_check ) {
-    typedef websocketpp::message_buffer::message<stub> message_type;
-    typedef stub<message_type> stub_type;
+	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));
+	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_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;
+	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));
+	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);
+	BOOST_CHECK(s->recycled == false);
+	BOOST_CHECK(msg->recycle() == false);
+	BOOST_CHECK(s->recycled == true);
 }
 

test/message_buffer/pool.cpp

@@ -54,9 +54,9 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
     bool exception;
 
     try {
-        u = p.get_uri(r);
+    	u = p.get_uri(r);
     } catch (const websocketpp::uri_exception& e) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK(exception == false);
@@ -147,9 +147,9 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
     BOOST_CHECK(!p.validate_handshake(r));
 
     try {
-        u = p.get_uri(r);
+    	u = p.get_uri(r);
     } catch (const websocketpp::uri_exception& e) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK(exception == true);

test/processors/extension_permessage_compress.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

test/processors/hybi00.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -38,15 +38,15 @@
 #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::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;
+	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 {
@@ -55,16 +55,16 @@ struct processor_setup {
       , 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::con_msg_manager_type::ptr msg_manager;
+	stub_config::request_type req;
     stub_config::response_type res;
-    websocketpp::processor::hybi00<stub_config> p;
+	websocketpp::processor::hybi00<stub_config> p;
 };
 
 typedef stub_config::message_type::ptr message_ptr;
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
-    processor_setup env(true);
+	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";
 
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 }
 
 BOOST_AUTO_TEST_CASE( non_get_method ) {
-    processor_setup env(true);
+	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";
 
@@ -109,7 +109,7 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 }
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
-    processor_setup env(true);
+	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";
 
@@ -122,7 +122,7 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 }
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    processor_setup env(true);
+	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";
 
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 }
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
-    processor_setup env(true);
+	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";
 
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 }
 
 BOOST_AUTO_TEST_CASE( bad_host ) {
-    processor_setup env(true);
+	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";
@@ -164,7 +164,7 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
 }
 
 BOOST_AUTO_TEST_CASE( extract_subprotocols ) {
-    processor_setup env(true);
+	processor_setup env(true);
 
     std::vector<std::string> subps;
 

test/processors/hybi07.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -40,13 +40,13 @@
 #include <websocketpp/random/none.hpp>
 
 struct stub_config {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
+	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::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;
 
@@ -67,10 +67,10 @@ struct stub_config {
 };
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -101,10 +101,10 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 }
 
 BOOST_AUTO_TEST_CASE( non_get_method ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -119,10 +119,10 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 }
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -137,10 +137,10 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 }
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -155,10 +155,10 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 }
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -173,10 +173,10 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 }
 
 BOOST_AUTO_TEST_CASE( bad_host ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 

test/processors/hybi08.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -40,13 +40,13 @@
 #include <websocketpp/random/none.hpp>
 
 struct stub_config {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
+	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::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;
 
@@ -67,10 +67,10 @@ struct stub_config {
 };
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -101,10 +101,10 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 }
 
 BOOST_AUTO_TEST_CASE( non_get_method ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
     stub_config::rng_type rng;
-    stub_config::con_msg_manager_type::ptr msg_manager;
+	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;
 
@@ -119,10 +119,10 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 }
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -137,10 +137,10 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 }
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -155,10 +155,10 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
 }
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;
 
@@ -173,10 +173,10 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 }
 
 BOOST_AUTO_TEST_CASE( bad_host ) {
-    stub_config::request_type r;
+	stub_config::request_type r;
     stub_config::response_type response;
-    stub_config::con_msg_manager_type::ptr msg_manager;
-    stub_config::rng_type rng;
+	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;

test/processors/hybi13.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -43,13 +43,13 @@
 #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::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::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;
 
@@ -65,13 +65,13 @@ struct stub_config {
 };
 
 struct stub_config_ext {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
+	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::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;
 
@@ -97,11 +97,11 @@ struct processor_setup {
       , 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;
+	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;
+	websocketpp::processor::hybi13<stub_config> p;
 };
 
 struct processor_setup_ext {
@@ -110,15 +110,15 @@ struct processor_setup_ext {
       , 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;
+	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;
+	websocketpp::processor::hybi13<stub_config_ext> p;
 };
 
 BOOST_AUTO_TEST_CASE( exact_match ) {
-    processor_setup env(true);
+	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";
 
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE( exact_match ) {
 }
 
 BOOST_AUTO_TEST_CASE( non_get_method ) {
-    processor_setup env(true);
+	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";
 
@@ -157,7 +157,7 @@ BOOST_AUTO_TEST_CASE( non_get_method ) {
 }
 
 BOOST_AUTO_TEST_CASE( old_http_version ) {
-    processor_setup env(true);
+	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";
 
@@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE( old_http_version ) {
 }
 
 BOOST_AUTO_TEST_CASE( missing_handshake_key1 ) {
-    processor_setup env(true);
+	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";
 
@@ -193,7 +193,7 @@ BOOST_AUTO_TEST_CASE( missing_handshake_key2 ) {
 }
 
 BOOST_AUTO_TEST_CASE( bad_host ) {
-    processor_setup env(true);
+	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";
 
@@ -220,243 +220,243 @@ BOOST_AUTO_TEST_CASE( bad_host ) {
 // 0x81 0x80
 
 BOOST_AUTO_TEST_CASE( frame_empty_binary_unmasked ) {
-    uint8_t frame[2] = {0x82, 0x00};
+	uint8_t frame[2] = {0x82, 0x00};
 
-    // all in one chunk
-    processor_setup env1(false);
+	// all in one chunk
+	processor_setup env1(false);
 
-    size_t ret1 = env1.p.consume(frame,2,env1.ec);
+	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 );
+	BOOST_CHECK_EQUAL( ret1, 2 );
+	BOOST_CHECK( !env1.ec );
+	BOOST_CHECK_EQUAL( env1.p.ready(), true );
 
-    // two separate chunks
-    processor_setup env2(false);
+	// 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,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_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);
+	processor_setup env(false);
 
-    uint8_t frame[4] = {0x82, 0x02, 0x2A, 0x2A};
+	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 );
+	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();
+	message_ptr foo = env.p.get_message();
 
-    BOOST_CHECK_EQUAL( env.p.get_message(), message_ptr() );
-    BOOST_CHECK_EQUAL( foo->get_payload(), "**" );
+	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);
+	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);
+	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 );
+	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();
+	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_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);
+	processor_setup env(false);
 
-    uint8_t frame[130] = {0x82, 0x7E, 0x00, 0x7E};
-    std::fill_n(frame+4,126,0x2A);
+	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 );
+	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();
+	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_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);
+	processor_setup env(false);
 
-    uint8_t frame[130] = {0x88, 0x7E, 0x00, 0x7E};
-    std::fill_n(frame+4,126,0x2A);
+	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_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}};
+	uint8_t frame[3][2] = {{0x90, 0x00},
+		                   {0xA0, 0x00},
+	                       {0xC0, 0x00}};
 
-    for (int i = 0; i < 3; i++) {
-        processor_setup env(false);
+	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_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}};
+	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);
+	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_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);
+	processor_setup env(false);
 
-    uint8_t frame[2] = {0x08, 0x00};
+	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_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);
+	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};
+	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 );
+	// 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(), "**" );
+	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 );
+	// 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_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(), "**" );
+	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 );
+	// 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_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(), "**" );
+	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.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_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_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);
+	processor_setup env(true);
 
-    uint8_t frame[2] = {0x82, 0x00};
+	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_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);
+	processor_setup env(false);
 
-    uint8_t frame[8] = {0x82, 0x82, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0xD5};
+	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_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);
+	processor_setup env(true);
 
-    uint8_t frame[8] = {0x82, 0x82, 0xFF, 0xFF, 0xFF, 0xFF, 0xD5, 0xD5};
+	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_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_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};
+	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 );
+	// 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_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);
+	processor_setup env(true);
 
     message_ptr in = env.msg_manager->get_message();
     message_ptr out = env.msg_manager->get_message();
@@ -496,10 +496,10 @@ BOOST_AUTO_TEST_CASE( single_frame_message_too_large ) {
     
     env.p.set_max_message_size(3);
     
-    uint8_t frame0[10] = {0x82, 0x84, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01};
+	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 );
+	// 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 );
 }
 
@@ -508,11 +508,11 @@ BOOST_AUTO_TEST_CASE( multiple_frame_message_too_large ) {
     
     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};
+	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 );
+	// 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
@@ -638,7 +638,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_unknown ) {
 }
 
 BOOST_AUTO_TEST_CASE( extract_subprotocols_empty ) {
-    processor_setup env(true);
+	processor_setup env(true);
     std::vector<std::string> subps;
 
     BOOST_CHECK( !env.p.extract_subprotocols(env.req,subps) );
@@ -646,7 +646,7 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_empty ) {
 }
 
 BOOST_AUTO_TEST_CASE( extract_subprotocols_one ) {
-    processor_setup env(true);
+	processor_setup env(true);
     std::vector<std::string> subps;
 
     env.req.replace_header("Sec-WebSocket-Protocol","foo");
@@ -657,7 +657,7 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_one ) {
 }
 
 BOOST_AUTO_TEST_CASE( extract_subprotocols_multiple ) {
-    processor_setup env(true);
+	processor_setup env(true);
     std::vector<std::string> subps;
 
     env.req.replace_header("Sec-WebSocket-Protocol","foo,bar");
@@ -669,7 +669,7 @@ BOOST_AUTO_TEST_CASE( extract_subprotocols_multiple ) {
 }
 
 BOOST_AUTO_TEST_CASE( extract_subprotocols_invalid) {
-    processor_setup env(true);
+	processor_setup env(true);
     std::vector<std::string> subps;
 
     env.req.replace_header("Sec-WebSocket-Protocol","foo,bar,,,,");

test/random/SConscript

@@ -10,7 +10,7 @@ Import('polyfill_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','random','system'],env) + [platform_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','random'],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)

test/random/none.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

test/random/random_device.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

test/roles/client.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -130,8 +130,8 @@ BOOST_AUTO_TEST_CASE( connect_con ) {
 
     // TODO: more tests related to reading the HTTP response
     std::stringstream channel2;
-    channel2 << "e\r\n\r\n";
-    channel2 >> *con;
+	channel2 << "e\r\n\r\n";
+	channel2 >> *con;
 }
 
 BOOST_AUTO_TEST_CASE( select_subprotocol ) {
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE( select_subprotocol ) {
 
     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_CHECK_THROW( con->select_subprotocol("foo") , websocketpp::lib::error_code );
 }
 
 BOOST_AUTO_TEST_CASE( add_subprotocols_invalid ) {
@@ -158,11 +158,11 @@ BOOST_AUTO_TEST_CASE( add_subprotocols_invalid ) {
 
     con->add_subprotocol("",ec);
     BOOST_CHECK_EQUAL( ec , make_error_code(websocketpp::error::invalid_subprotocol) );
-    BOOST_CHECK_THROW( con->add_subprotocol("") , websocketpp::exception );
+    BOOST_CHECK_THROW( con->add_subprotocol("") , websocketpp::lib::error_code );
 
     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_CHECK_THROW( con->add_subprotocol("foo,bar") , websocketpp::lib::error_code );
 }
 
 BOOST_AUTO_TEST_CASE( add_subprotocols ) {

test/roles/server.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -67,19 +67,19 @@ 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.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();
+	con = s.get_connection();
+	con->start();
 
-    std::stringstream channel;
+	std::stringstream channel;
 
-    channel << input;
-    channel >> *con;
+	channel << input;
+	channel >> *con;
 
-    return output.str();
+	return output.str();
 }
 
 /* handler library*/
@@ -121,8 +121,8 @@ 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");
+	server s;
+	s.set_user_agent("test");
 
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE( invalid_websocket_version ) {
 
     server s;
     s.set_user_agent("test");
-    //s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+	//s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
 
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
 }
@@ -143,7 +143,7 @@ BOOST_AUTO_TEST_CASE( unimplemented_websocket_version ) {
 
     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;
+	server s;
     s.set_user_agent("test");
 
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
@@ -154,11 +154,11 @@ BOOST_AUTO_TEST_CASE( list_subprotocol_empty ) {
 
     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;
+	std::string subprotocol;
 
-    server s;
+	server s;
     s.set_user_agent("test");
-    s.set_open_handler(bind(&open_func_subprotocol,&s,&subprotocol,::_1));
+	s.set_open_handler(bind(&open_func_subprotocol,&s,&subprotocol,::_1));
 
     BOOST_CHECK_EQUAL(run_server_test(s,input), output);
     BOOST_CHECK_EQUAL(subprotocol, "");
@@ -169,13 +169,13 @@ BOOST_AUTO_TEST_CASE( list_subprotocol_one ) {
 
     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;
+	std::string validate;
+	std::string open;
 
-    server s;
+	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));
+	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,");
@@ -187,13 +187,13 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_one ) {
 
     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;
+	std::string validate;
+	std::string open;
 
-    server s;
+	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));
+	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,");
@@ -205,17 +205,17 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_invalid ) {
 
     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;
+	std::string validate;
+	std::string open;
 
-    server s;
+	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));
+	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;
+	std::string o;
 
-    BOOST_CHECK_THROW(o = run_server_test(s,input), websocketpp::exception);
+	BOOST_CHECK_THROW(o = run_server_test(s,input), websocketpp::lib::error_code);
 }
 
 BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {
@@ -223,13 +223,13 @@ BOOST_AUTO_TEST_CASE( accept_subprotocol_two ) {
 
     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;
+	std::string validate;
+	std::string open;
 
-    server s;
+	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));
+	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,");

test/transport/asio/base.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

test/transport/asio/timers.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -107,7 +107,7 @@ struct config {
 
 // 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) {
+context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
     return context_ptr(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
 }
 

test/transport/integration.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -273,12 +273,11 @@ void run_dummy_client(std::string port) {
     }
 }
 
-bool on_ping(server * s, websocketpp::connection_hdl, std::string) {
-    s->get_alog().write(websocketpp::log::alevel::app,"got ping");
+bool on_ping(websocketpp::connection_hdl, std::string payload) {
     return false;
 }
 
-void cancel_on_open(server * s, websocketpp::connection_hdl) {
+void cancel_on_open(server * s, websocketpp::connection_hdl hdl) {
     s->stop_listening();
 }
 
@@ -292,30 +291,28 @@ void stop_on_close(server * s, websocketpp::connection_hdl hdl) {
 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());
+    con->ping(payload);
 }
 
-void fail_on_pong(websocketpp::connection_hdl, std::string) {
+void fail_on_pong(websocketpp::connection_hdl hdl, std::string payload) {
     BOOST_FAIL( "expected no pong handler" );
 }
 
-void fail_on_pong_timeout(websocketpp::connection_hdl, std::string) {
+void fail_on_pong_timeout(websocketpp::connection_hdl hdl, std::string payload) {
     BOOST_FAIL( "expected no pong timeout" );
 }
 
-void req_pong(std::string expected_payload, websocketpp::connection_hdl,
+void req_pong(std::string expected_payload, websocketpp::connection_hdl hdl,
     std::string payload)
 {
     BOOST_CHECK_EQUAL( expected_payload, payload );
 }
 
-void fail_on_open(websocketpp::connection_hdl) {
+void fail_on_open(websocketpp::connection_hdl hdl) {
     BOOST_FAIL( "expected no open handler" );
 }
 
-void delay(websocketpp::connection_hdl, long duration) {
+void delay(websocketpp::connection_hdl hdl, long duration) {
     sleep(duration);
 }
 
@@ -385,7 +382,7 @@ BOOST_AUTO_TEST_CASE( pong_timeout ) {
     server s;
     client c;
 
-    s.set_ping_handler(bind(&on_ping, &s,::_1,::_2));
+    s.set_ping_handler(on_ping);
     s.set_close_handler(bind(&stop_on_close,&s,::_1));
 
     c.set_fail_handler(bind(&check_ec<client>,&c,
@@ -398,7 +395,7 @@ BOOST_AUTO_TEST_CASE( pong_timeout ) {
         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));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
 
     run_client(c, "http://localhost:9005",false);
@@ -416,7 +413,7 @@ BOOST_AUTO_TEST_CASE( client_open_handshake_timeout ) {
         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));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     sthread.detach();
     tthread.detach();
 
@@ -433,7 +430,7 @@ BOOST_AUTO_TEST_CASE( server_open_handshake_timeout ) {
         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));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
 
     run_dummy_client("9005");
@@ -456,7 +453,7 @@ BOOST_AUTO_TEST_CASE( client_self_initiated_close_handshake_timeout ) {
         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));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
 
     run_client(c, "http://localhost:9005", false);
@@ -488,7 +485,7 @@ BOOST_AUTO_TEST_CASE( server_self_initiated_close_handshake_timeout ) {
     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));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,6));
     tthread.detach();
 
     run_client(c, "http://localhost:9005",false);
@@ -566,7 +563,7 @@ BOOST_AUTO_TEST_CASE( stop_listening ) {
     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));
+    websocketpp::lib::thread tthread(websocketpp::lib::bind(&run_test_timer,2));
     tthread.detach();
 
     run_client(c, "http://localhost:9005",false);
@@ -578,17 +575,17 @@ 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
@@ -606,4 +603,4 @@ BOOST_AUTO_TEST_CASE( pause_reading ) {
 
 BOOST_AUTO_TEST_CASE( server_connection_cleanup ) {
     server_tls s;
-}
+}

test/transport/iostream/base.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

test/transport/iostream/connection.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -63,7 +63,6 @@ struct stub_con : public iostream_con {
         // 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
@@ -95,7 +94,7 @@ struct stub_con : public iostream_con {
     }
 
     void async_read_at_least(size_t num_bytes, char *buf, size_t len)
-    {
+	{
         iostream_con::async_read_at_least(
             num_bytes,
             buf,
@@ -112,55 +111,7 @@ struct stub_con : public iostream_con {
         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
@@ -170,11 +121,11 @@ 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_CHECK( con->is_secure() == false );
+    BOOST_CHECK( con->get_remote_endpoint() == "iostream transport" );
 }
 
-BOOST_AUTO_TEST_CASE( write_before_output_method_set ) {
+BOOST_AUTO_TEST_CASE( write_before_ostream_set ) {
     stub_con::ptr con(new stub_con(true,alogger,elogger));
 
     con->write("foo");
@@ -182,10 +133,10 @@ BOOST_AUTO_TEST_CASE( write_before_output_method_set ) {
 
     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_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::output_stream_required) );
 }
 
-BOOST_AUTO_TEST_CASE( async_write_ostream ) {
+BOOST_AUTO_TEST_CASE( async_write ) {
     stub_con::ptr con(new stub_con(true,alogger,elogger));
 
     std::stringstream output;
@@ -195,43 +146,10 @@ BOOST_AUTO_TEST_CASE( async_write_ostream ) {
     con->write("foo");
 
     BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output.str(), "foo" );
+    BOOST_CHECK( 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 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 ) {
+BOOST_AUTO_TEST_CASE( async_write_vector_0 ) {
     std::stringstream output;
 
     stub_con::ptr con(new stub_con(true,alogger,elogger));
@@ -242,31 +160,10 @@ BOOST_AUTO_TEST_CASE( async_write_vector_0_ostream ) {
     con->write(bufs);
 
     BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output.str(), "" );
+    BOOST_CHECK( 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 ) {
+BOOST_AUTO_TEST_CASE( async_write_vector_1 ) {
     std::stringstream output;
 
     stub_con::ptr con(new stub_con(true,alogger,elogger));
@@ -281,34 +178,10 @@ BOOST_AUTO_TEST_CASE( async_write_vector_1_ostream ) {
     con->write(bufs);
 
     BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( output.str(), "foo" );
+    BOOST_CHECK( 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 ) {
+BOOST_AUTO_TEST_CASE( async_write_vector_2 ) {
     std::stringstream output;
 
     stub_con::ptr con(new stub_con(true,alogger,elogger));
@@ -325,33 +198,7 @@ BOOST_AUTO_TEST_CASE( async_write_vector_2_ostream ) {
     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_CHECK( output.str() == "foobar" );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least_too_much ) {
@@ -360,7 +207,7 @@ BOOST_AUTO_TEST_CASE( async_read_at_least_too_much ) {
     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_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::invalid_num_bytes) );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least_double_read ) {
@@ -370,7 +217,7 @@ BOOST_AUTO_TEST_CASE( async_read_at_least_double_read ) {
 
     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_CHECK( con->ec == make_error_code(websocketpp::transport::iostream::error::double_read) );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least ) {
@@ -381,32 +228,32 @@ BOOST_AUTO_TEST_CASE( async_read_at_least ) {
     memset(buf,'x',10);
 
     con->async_read_at_least(5,buf,10);
-    BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::error::test) );
+    BOOST_CHECK( 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) );
+	channel << "abcd";
+	channel >> *con;
+	BOOST_CHECK( channel.tellg() == -1 );
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
 
     std::stringstream channel2;
-    channel2 << "e";
-    channel2 >> *con;
-    BOOST_CHECK_EQUAL( channel2.tellg(), -1 );
+	channel2 << "e";
+	channel2 >> *con;
+	BOOST_CHECK( channel2.tellg() == -1 );
     BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+    BOOST_CHECK( std::string(buf,10) == "abcdexxxxx" );
 
     std::stringstream channel3;
-    channel3 << "f";
-    channel3 >> *con;
-    BOOST_CHECK_EQUAL( channel3.tellg(), 0 );
+	channel3 << "f";
+	channel3 >> *con;
+	BOOST_CHECK( channel3.tellg() == 0 );
     BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+    BOOST_CHECK( std::string(buf,10) == "abcdexxxxx" );
     con->async_read_at_least(1,buf+5,5);
     channel3 >> *con;
-    BOOST_CHECK_EQUAL( channel3.tellg(), -1 );
+    BOOST_CHECK( channel3.tellg() == -1 );
     BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefxxxx" );
+    BOOST_CHECK( std::string(buf,10) == "abcdefxxxx" );
 }
 
 BOOST_AUTO_TEST_CASE( async_read_at_least2 ) {
@@ -417,23 +264,23 @@ BOOST_AUTO_TEST_CASE( async_read_at_least2 ) {
     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( con->ec == make_error_code(websocketpp::error::test) );
 
     std::stringstream channel;
-    channel << "abcdefg";
-    channel >> *con;
-    BOOST_CHECK_EQUAL( channel.tellg(), 5 );
+	channel << "abcdefg";
+	channel >> *con;
+    BOOST_CHECK( channel.tellg() == 5 );
     BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdexxxxx" );
+    BOOST_CHECK( std::string(buf,10) == "abcdexxxxx" );
 
     con->async_read_at_least(1,buf+5,5);
-    channel >> *con;
-    BOOST_CHECK_EQUAL( channel.tellg(), -1 );
+	channel >> *con;
+	BOOST_CHECK( channel.tellg() == -1 );
     BOOST_CHECK( !con->ec );
-    BOOST_CHECK_EQUAL( std::string(buf,10), "abcdefgxxx" );
+    BOOST_CHECK( std::string(buf,10) == "abcdefgxxx" );
 }
 
-void timer_callback_stub(websocketpp::lib::error_code const &) {}
+void timer_callback_stub(const websocketpp::lib::error_code & ec) {}
 
 BOOST_AUTO_TEST_CASE( set_timer ) {
    stub_con::ptr con(new stub_con(true,alogger,elogger));
@@ -450,7 +297,7 @@ BOOST_AUTO_TEST_CASE( async_read_at_least_read_some ) {
     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( con->ec == make_error_code(websocketpp::error::test) );
 
     char input[10] = "abcdefg";
     BOOST_CHECK_EQUAL(con->read_some(input,5), 5);
@@ -467,52 +314,11 @@ BOOST_AUTO_TEST_CASE( async_read_at_least_read_some ) {
     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) );
+    BOOST_CHECK( con->ec == make_error_code(websocketpp::error::test) );
     con->eof();
     BOOST_CHECK_EQUAL( con->ec, make_error_code(websocketpp::transport::error::eof) );
 }
@@ -521,31 +327,11 @@ 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) );
+    BOOST_CHECK( 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));
 
@@ -554,7 +340,7 @@ BOOST_AUTO_TEST_CASE( shared_pointer_memory_cleanup ) {
     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( con->ec == make_error_code(websocketpp::error::test) );
     BOOST_CHECK_EQUAL(con.use_count(), 2);
 
     char input[10] = "foo";

test/transport/iostream/endpoint.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -35,7 +35,7 @@
 BOOST_AUTO_TEST_CASE( placeholder ) {}
 
 /*BOOST_AUTO_TEST_CASE( blank_error ) {
-    websocketpp::lib::error_code ec;
+	websocketpp::lib::error_code ec;
 
     BOOST_CHECK( !ec );
 }*/

test/utility/SConscript

@@ -16,13 +16,11 @@ 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]
@@ -30,11 +28,9 @@ if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    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')

test/utility/close.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -37,89 +37,89 @@
 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_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_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";
+	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 = 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 = 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 = 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 );
+	// 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 = "";
+	lib::error_code ec;
+	std::string payload = "";
 
-    BOOST_CHECK( close::extract_code(payload,ec) == close::status::no_status );
-    BOOST_CHECK( !ec );
+	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";
+	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_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";
+	lib::error_code ec;
+	std::string payload = "00Foo";
 
-    BOOST_CHECK( close::extract_reason(payload,ec) == "Foo" );
-    BOOST_CHECK( !ec );
+	BOOST_CHECK( close::extract_reason(payload,ec) == "Foo" );
+	BOOST_CHECK( !ec );
 
-    payload = "";
-    BOOST_CHECK( close::extract_reason(payload,ec) == "" );
-    BOOST_CHECK( !ec );
+	payload = "";
+	BOOST_CHECK( close::extract_reason(payload,ec) == "" );
+	BOOST_CHECK( !ec );
 
-    payload = "00";
-    BOOST_CHECK( close::extract_reason(payload,ec) == "" );
-    BOOST_CHECK( !ec );
+	payload = "00";
+	BOOST_CHECK( close::extract_reason(payload,ec) == "" );
+	BOOST_CHECK( !ec );
 
-    payload = "000";
-    payload[2] = char(0xFF);
+	payload = "000";
+	payload[2] = char(0xFF);
 
-    close::extract_reason(payload,ec);
-    BOOST_CHECK( ec == error::invalid_utf8 );
+	close::extract_reason(payload,ec);
+	BOOST_CHECK( ec == error::invalid_utf8 );
 }

test/utility/frame.cpp

@@ -37,98 +37,98 @@
 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
+	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 );
+	// 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 );
+	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 );
+	// Set Values
+	frame::set_fin(h1,true);
+	BOOST_CHECK( h1.b0 == 0x80 );
 
-    frame::set_rsv1(h1,true);
-    BOOST_CHECK( h1.b0 == 0xC0 );
+	frame::set_rsv1(h1,true);
+	BOOST_CHECK( h1.b0 == 0xC0 );
 
-    frame::set_rsv2(h1,true);
-    BOOST_CHECK( h1.b0 == 0xE0 );
+	frame::set_rsv2(h1,true);
+	BOOST_CHECK( h1.b0 == 0xE0 );
 
-    frame::set_rsv3(h1,true);
-    BOOST_CHECK( h1.b0 == 0xF0 );
+	frame::set_rsv3(h1,true);
+	BOOST_CHECK( h1.b0 == 0xF0 );
 
-    frame::set_masked(h1,true);
-    BOOST_CHECK( h1.b1 == 0x80 );
+	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 );
+	// 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 );
+	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
+	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 );
+	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,1);
+	BOOST_CHECK( h1.b1 == 0x01 );
 
-    frame::set_basic_size(h1,125);
-    BOOST_CHECK( h1.b1 == 0x7D );
+	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,126);
+	BOOST_CHECK( h1.b1 == 0x7E );
 
-    frame::set_basic_size(h1,127);
-    BOOST_CHECK( h1.b1 == 0x7F );
+	frame::set_basic_size(h1,127);
+	BOOST_CHECK( h1.b1 == 0x7F );
 
-    frame::set_basic_size(h1,0);
-    BOOST_CHECK( h1.b1 == 0x00 );*/
+	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
+	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);
@@ -139,127 +139,127 @@ BOOST_AUTO_TEST_CASE( basic_header_length ) {
 }
 
 BOOST_AUTO_TEST_CASE( basic_opcode ) {
-    frame::basic_header h1(0x00,0x00);
+	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( 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_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 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 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 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 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};
+	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_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 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 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 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 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 );
+	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};
+	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)) );
+	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};
+	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_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;
+	frame::masking_key_type key;
 
-    key.i = htonl(0x12345678);
+	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) );
-    }
+	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;
+	frame::masking_key_type key;
 
-    key.i = htonl(0xD5FB70EE);
+	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) );
-    }
+	// 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.
@@ -282,241 +282,241 @@ BOOST_AUTO_TEST_CASE( circshift ) {
 }
 
 BOOST_AUTO_TEST_CASE( block_byte_mask ) {
-    uint8_t input[15] = {0x00, 0x00, 0x00, 0x00,
-                         0x00, 0x00, 0x00, 0x00,
+	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 output[15];
 
-    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
+	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;
+	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);
+	byte_mask(input,input+15,output,key);
 
-    BOOST_CHECK( std::equal(output,output+15,masked) );
+	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,
+	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,
+	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;
+	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);
+	byte_mask(buffer,buffer+15,key);
 
-    BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
+	BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
 }
 
 BOOST_AUTO_TEST_CASE( block_word_mask ) {
-    uint8_t input[15] =  {0x00, 0x00, 0x00, 0x00,
+	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 output[15];
 
-    uint8_t masked[15] = {0x00, 0x01, 0x02, 0x03,
+	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;
+	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);
+	word_mask_exact(input,output,15,key);
 
-    BOOST_CHECK( std::equal(output,output+15,masked) );
+	BOOST_CHECK( std::equal(output,output+15,masked) );
 }
 
 BOOST_AUTO_TEST_CASE( block_word_mask_inplace ) {
-    uint8_t buffer[15] = {0x00, 0x00, 0x00, 0x00,
+	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,
+	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;
+	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);
+	word_mask_exact(buffer,15,key);
 
-    BOOST_CHECK( std::equal(buffer,buffer+15,masked) );
+	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 input[16];
+	uint8_t output[16];
 
-    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+	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;
+	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) );
+	// 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);
+	// 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,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) );
+	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 input[16];
+	uint8_t output[16];
 
-    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+	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;
+	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) );
+	// 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);
+	// 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,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) );
+	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 buffer[16];
 
-    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+	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;
+	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) );
+	// 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);
+	// 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,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) );
+	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 buffer[16];
 
-    uint8_t masked[16] = {0x00, 0x01, 0x02, 0x03,
+	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;
+	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) );
+	// 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);
+	// 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,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) );
+	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,
+	uint8_t buffer[12] = {0xA6, 0x15, 0x97, 0xB9,
                           0x81, 0x50, 0xAC, 0xBA,
                           0x9C, 0x1C, 0x9F, 0xF4};
 
@@ -524,15 +524,15 @@ BOOST_AUTO_TEST_CASE( continuous_word_mask2 ) {
                             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;
+	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) );
+	// 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) );
 }

test/utility/uri.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

tutorials/chat_tutorial/chat_tutorial.md

@@ -2,7 +2,7 @@ Chat Tutorial
 =============
 
 Goals of this tutorial:
-- Implement a realtime websocket chat server
+- Impliment a realtime websocket chat server
 
 
 Server

tutorials/utility_client/step3.cpp

@@ -48,7 +48,7 @@ public:
         m_endpoint.init_asio();
         m_endpoint.start_perpetual();
 
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
     }
 private:
     client m_endpoint;

tutorials/utility_client/step4.cpp

@@ -97,7 +97,7 @@ public:
         m_endpoint.init_asio();
         m_endpoint.start_perpetual();
 
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
     }
 
     int connect(std::string const & uri) {
@@ -111,7 +111,7 @@ public:
         }
 
         int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
+        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(

tutorials/utility_client/step5.cpp

@@ -119,7 +119,7 @@ public:
         m_endpoint.init_asio();
         m_endpoint.start_perpetual();
 
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
     }
 
     ~websocket_endpoint() {
@@ -155,7 +155,7 @@ public:
         }
 
         int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr = websocketpp::lib::make_shared<connection_metadata>(new_id, con->get_handle(), uri);
+        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(

tutorials/utility_client/step6.cpp

@@ -1,335 +0,0 @@
-/*
- * 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
-
-*/

tutorials/utility_client/utility_client.md

@@ -221,7 +221,7 @@ int main() {
 
 _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.
+This step adds two new commands to app_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
 
@@ -263,7 +263,7 @@ A new WebSocket connection is initiated via a three step process. First, a conne
 > **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.
+> For clarity about error handling the app_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.
 
@@ -286,7 +286,7 @@ Next, the connection request is configured. For this step the only configuration
 >
 > 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.
+`app_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.
 
@@ -591,7 +591,7 @@ void close(int id, websocketpp::close::status::value code) {
 
 #### 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.
+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::send` 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.
 
@@ -654,7 +654,7 @@ Enter Command: close 0 1001 example message
 Enter Command: show 0
 > URI: ws://localhost:9002
 > Status: Closed
-> Remote Server: WebSocket++/0.4.0
+> Remote Server: WebSocket++/0.3.0-alpha4
 > Error/close reason: close code: 1001 (Going away), close reason:  example message
 Enter Command: connect ws://localhost:9002
 > Created connection with id 1
@@ -668,146 +668,9 @@ Enter Command: quit
 
 _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
-```
+- Sending a messages
+- terminology: WebSocket opcodes, text vs binary messages
+- Receiving a message
 
 ### Step 7
 

websocketpp/base64/base64.hpp

@@ -45,11 +45,6 @@ static std::string const base64_chars =
              "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
@@ -57,21 +52,17 @@ static inline bool is_base64(unsigned char c) {
            (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) {
+inline std::string base64_encode(unsigned char const * bytes_to_encode, unsigned
+    int in_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++);
+    while (in_len--) {
+        char_array_3[i++] = *(bytes_to_encode++);
         if (i == 3) {
             char_array_4[0] = (char_array_3[0] & 0xfc) >> 2;
             char_array_4[1] = ((char_array_3[0] & 0x03) << 4) +
@@ -106,38 +97,25 @@ inline std::string base64_encode(unsigned char const * input, size_t len) {
         while((i++ < 3)) {
             ret += '=';
         }
-    }
+  }
 
-    return 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()
-    );
+inline std::string base64_encode(std::string const & data) {
+    return base64_encode(reinterpret_cast<const unsigned char *>(data.data()),data.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();
+inline std::string base64_decode(std::string const & encoded_string) {
+    size_t in_len = encoded_string.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_++;
+    while (in_len-- && ( encoded_string[in_] != '=') && is_base64(encoded_string[in_])) {
+        char_array_4[i++] = encoded_string[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]));

websocketpp/client.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/close.hpp

@@ -1,6 +1,6 @@
 
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -150,21 +150,6 @@ namespace status {
      * 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;
@@ -219,7 +204,7 @@ namespace status {
     /**
      * See https://tools.ietf.org/html/rfc6455#section-7.4 for more details.
      *
-     * @since 0.3.0
+     * @since 0.4.0-beta1
      *
      * @param [in] code The code to look up.
      * @return A human readable interpretation of the code.
@@ -250,10 +235,6 @@ namespace status {
                 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";
         }

websocketpp/common/chrono.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/common/connection_hdl.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/common/cpp11.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -40,34 +40,12 @@
   #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. 
+#if defined(_WEBSOCKETPP_CPP11_STL_) || __cplusplus >= 201103L
+    // _WEBSOCKETPP_CPP11_STL_ is a flag from the build system that forces
+    // WebSocket++ into C++11 mode. __cplusplus is a define set by the compiler
+    // if it has full support for C++11 language features. If either are set use
+    // C++11 language features
     #ifndef _WEBSOCKETPP_NOEXCEPT_TOKEN_
         #define _WEBSOCKETPP_NOEXCEPT_TOKEN_ noexcept
     #endif
@@ -80,16 +58,7 @@
     #ifndef _WEBSOCKETPP_NULLPTR_TOKEN_
         #define _WEBSOCKETPP_NULLPTR_TOKEN_ nullptr
     #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_

websocketpp/common/functional.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -28,37 +28,19 @@
 #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_
+#if defined _WEBSOCKETPP_CPP11_STL_ && !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 {
 
@@ -67,18 +49,6 @@ namespace lib {
     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;
@@ -87,15 +57,6 @@ namespace lib {
         /// \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
 

websocketpp/common/memory.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -28,32 +28,16 @@
 #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_
+#if defined _WEBSOCKETPP_CPP11_STL_ && !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>
@@ -67,7 +51,6 @@ namespace lib {
     using std::weak_ptr;
     using std::enable_shared_from_this;
     using std::static_pointer_cast;
-    using std::make_shared;
 
     typedef std::unique_ptr<unsigned char[]> unique_ptr_uchar_array;
 #else
@@ -75,7 +58,6 @@ namespace lib {
     using boost::weak_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

websocketpp/common/network.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -42,7 +42,7 @@ namespace net {
 
 inline bool is_little_endian() {
     short int val = 0x1;
-    char *ptr = reinterpret_cast<char *>(&val);
+    char *ptr = (char*)&val;
     return (ptr[0] == 1);
 }
 
@@ -50,18 +50,7 @@ inline bool is_little_endian() {
 #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) {
+inline uint64_t htonll(uint64_t src) {
     static int typ = TYP_INIT;
     unsigned char c;
     union {
@@ -82,19 +71,8 @@ inline uint64_t _htonll(uint64_t src) {
     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);
+inline uint64_t ntohll(uint64_t src) {
+    return htonll(src);
 }
 
 } // net

websocketpp/common/platforms.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -38,9 +38,4 @@
     #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

websocketpp/common/random.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -28,28 +28,12 @@
 #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_
+#if defined _WEBSOCKETPP_CPP11_STL_ && !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

websocketpp/common/regex.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/common/stdint.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/common/system_error.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -28,28 +28,12 @@
 #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_
+#if defined _WEBSOCKETPP_CPP11_STL_ && !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

websocketpp/common/thread.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
+ * 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:
@@ -28,18 +28,9 @@
 #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
+#if defined _WEBSOCKETPP_CPP11_STL_ && !defined _WEBSOCKETPP_NO_CPP11_THREAD_
+    #ifndef _WEBSOCKETPP_CPP11_THREAD_
+        #define _WEBSOCKETPP_CPP11_THREAD_
     #endif
 #endif
 

websocketpp/concurrency/basic.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/concurrency/none.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -29,48 +29,26 @@
 #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) {}
+    explicit fake_lock_guard(fake_mutex foo) {}
     ~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.
- */
+/// Stub Concurrency policy to remove locking in single threaded projects
 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;
 };
 

websocketpp/config/asio.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/config/asio_client.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/config/asio_no_tls.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/config/asio_no_tls_client.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/config/boost_config.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -25,9 +25,9 @@
  *
  */
 
- // 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.
+ // 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
@@ -41,7 +41,7 @@
     #define _WEBSOCKETPP_CPP11_FUNCTIONAL_
 #endif
 
-#ifdef BOOST_ASIO_HAS_STD_CHRONO
+#ifndef BOOST_ASIO_HAS_STD_CHRONO
     #define _WEBSOCKETPP_CPP11_CHRONO_
 #endif
 
@@ -67,6 +67,5 @@
 
 #define _WEBSOCKETPP_NOEXCEPT_TOKEN_  BOOST_NOEXCEPT
 #define _WEBSOCKETPP_CONSTEXPR_TOKEN_  BOOST_CONSTEXPR
-// TODO: nullptr support
 
 #endif // WEBSOCKETPP_CONFIG_BOOST_CONFIG_HPP

websocketpp/config/core.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -223,21 +223,9 @@ struct core {
      *
      * The default is 32MB
      *
-     * @since 0.3.0
+     * @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;

websocketpp/config/core_client.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -232,22 +232,10 @@ struct core_client {
      *
      * The default is 32MB
      *
-     * @since 0.3.0
+     * @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;
 

websocketpp/config/debug.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:
@@ -224,22 +224,10 @@ struct debug_core {
      *
      * The default is 32MB
      *
-     * @since 0.3.0
+     * @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;
 

websocketpp/config/debug_asio.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/config/debug_asio_no_tls.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
+ * 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:

websocketpp/config/minimal_client.hpp

@@ -1,72 +0,0 @@
-/*
- * 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

websocketpp/config/minimal_server.hpp

@@ -1,312 +0,0 @@
-/*
- * 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