reset some defaults

add some initial tls support to the testee server

.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,11 +78,3 @@ examples/wsperf/wsperf_client
 *.out
 
 *.log
-*.opensdf
-*.sdf
-*.vcxproj
-*.vcxproj.filters
-*.user
-install
-Makefile
-bin

.travis.yml

@@ -2,7 +2,7 @@ language: cpp
 compiler:
   - gcc
 before_install:
- - sudo apt-get install libboost-chrono1.48-dev libboost-regex1.48-dev libboost-system1.48-dev libboost-thread1.48-dev libboost-test1.48-dev libboost-random1.48-dev -y
+ - sudo apt-get install libboost-regex1.48-dev libboost-system1.48-dev libboost-thread1.48-dev libboost-test1.48-dev libboost-random1.48-dev -y
 env:
   global:
     - BOOST_INCLUDES=/usr/include
@@ -14,7 +14,6 @@ branches:
     - permessage-deflate
     - experimental
     - 0.3.x-cmake
-    - develop
 notifications:
   recipients:
     - travis@zaphoyd.com

CMakeLists.txt

@@ -9,12 +9,10 @@ project (websocketpp)
 cmake_minimum_required (VERSION 2.6)
 
 set (WEBSOCKETPP_MAJOR_VERSION 0)
-set (WEBSOCKETPP_MINOR_VERSION 7)
+set (WEBSOCKETPP_MINOR_VERSION 3)
 set (WEBSOCKETPP_PATCH_VERSION 0)
 set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
 
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
 set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
 if (WIN32 AND NOT CYGWIN)
   set (DEF_INSTALL_CMAKE_DIR cmake)
@@ -72,7 +70,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
     ############ Compiler specific setup
 
     set (WEBSOCKETPP_PLATFORM_LIBS "")
-    set (WEBSOCKETPP_PLATFORM_TLS_LIBS "")
+    set (WEBSOCKETPP_PLATFORM_TSL_LIBS "")
     set (WEBSOCKETPP_BOOST_LIBS "")
 
     # VC9 and C++11 reasoning
@@ -89,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,9 +104,9 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
     # g++
     if (CMAKE_COMPILER_IS_GNUCXX)
         set (WEBSOCKETPP_PLATFORM_LIBS pthread rt)
-        set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+        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 ()
@@ -135,7 +126,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
         else()
             set (WEBSOCKETPP_PLATFORM_LIBS pthread)
         endif()
-        set (WEBSOCKETPP_PLATFORM_TLS_LIBS ssl crypto)
+        set (WEBSOCKETPP_PLATFORM_TSL_LIBS ssl crypto)
         set (WEBSOCKETPP_BOOST_LIBS system thread)
         set (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} "-std=c++0x -stdlib=libc++") # todo: is libc++ really needed here?
         if (NOT APPLE)
@@ -152,10 +143,6 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
         list (APPEND WEBSOCKETPP_BOOST_LIBS random)
     endif()
 
-    if (BUILD_TESTS)
-        list (APPEND WEBSOCKETPP_BOOST_LIBS unit_test_framework)
-    endif()
-
     ############ Dependencies
 
     # Set BOOST_ROOT env variable or pass with cmake -DBOOST_ROOT=path.
@@ -186,10 +173,6 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
         set (Boost_USE_STATIC_LIBS FALSE)
     endif ()
 
-	if (BOOST_STATIC)
-		set (Boost_USE_STATIC_LIBS TRUE)
-	endif ()
-
     set (Boost_FIND_REQUIRED TRUE)
     set (Boost_FIND_QUIETLY TRUE)
     set (Boost_DEBUG FALSE)
@@ -222,7 +205,6 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
     endif ()
 
     find_package(OpenSSL)
-    find_package(ZLIB)
 endif()
 
 ############ Add projects
@@ -232,12 +214,12 @@ add_subdirectory (websocketpp)
 
 # Add examples
 if (BUILD_EXAMPLES)
-    include_subdirs ("examples")
+    add_subdirectory (examples)
 endif ()
 
 # Add tests
 if (BUILD_TESTS)
-    include_subdirs ("test")
+    add_subdirectory (test)
 endif ()
 
 print_used_build_config()

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,8 @@ PROJECT_NAME           = "websocketpp"
 # if some version control system is used.
 
 
-PROJECT_NUMBER         = "0.7.x-dev"
+PROJECT_NUMBER         = "0.3.0-alpha4"
+
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer
@@ -973,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

@@ -79,8 +79,6 @@ elif env['PLATFORM'] == 'posix':
    env.Append(CCFLAGS = ['-Wall'])
    #env['LINKFLAGS'] = ''
 elif env['PLATFORM'] == 'darwin':
-   if not os.environ.has_key('CXX'):
-      env['CXX'] = "clang++"
    if env.has_key('DEBUG'):
       env.Append(CCFLAGS = ['-g', '-O0'])
    else:
@@ -100,32 +98,14 @@ else:
 if env['CXX'].startswith('g++'):
    #env.Append(CCFLAGS = ['-Wconversion'])
    env.Append(CCFLAGS = ['-Wcast-align'])
-   env.Append(CCFLAGS = ['-Wshadow'])
-   env.Append(CCFLAGS = ['-Wunused-parameter'])
 elif env['CXX'].startswith('clang++'):
    #env.Append(CCFLAGS = ['-Wcast-align'])
    #env.Append(CCFLAGS = ['-Wglobal-constructors'])
    #env.Append(CCFLAGS = ['-Wconversion'])
    env.Append(CCFLAGS = ['-Wno-padded'])
-   env.Append(CCFLAGS = ['-Wshadow'])
-   env.Append(CCFLAGS = ['-Wunused-parameter'])
-
-   env.Append(CCFLAGS = ['-Wsometimes-uninitialized'])
-   env.Append(CCFLAGS = ['-Wuninitialized'])
-
-   #env.Append(CCFLAGS = ['-Weverything'])
-   #env.Append(CCFLAGS = ['-Wno-documentation'])
-   #env.Append(CCFLAGS = ['-Wno-weak-vtables'])
-   #env.Append(CCFLAGS = ['-Wno-global-constructors'])
-   #env.Append(CCFLAGS = ['-Wno-sign-conversion'])
-   #env.Append(CCFLAGS = ['-Wno-exit-time-destructors'])
-
-
-
 
    # Wpadded
    # Wsign-conversion
-   #
 
 platform_libs = []
 tls_libs = []
@@ -148,7 +128,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++'):
@@ -162,7 +142,6 @@ if env_cpp11['CXX'].startswith('g++'):
       print "C++11 build environment is not supported on this version of G++"
 elif env_cpp11['CXX'].startswith('clang++'):
    print "C++11 build environment enabled"
-   env.Append(CXXFLANGS = ['-stdlib=libc++'],LINKFLAGS=['-stdlib=libc++'])
    env_cpp11.Append(WSPP_CPP11_ENABLED = "true",CXXFLAGS = ['-std=c++0x','-stdlib=libc++'],LINKFLAGS = ['-stdlib=libc++'],TOOLSET = ['clang++'],CPPDEFINES = ['_WEBSOCKETPP_CPP11_STL_'])
 
    # look for optional second boostroot compiled with clang's libc++ STL library
@@ -181,18 +160,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/'
@@ -230,7 +209,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)
@@ -241,25 +219,12 @@ testee_server = SConscript('#/examples/testee_server/SConscript',variant_dir = b
 # testee_client
 testee_client = SConscript('#/examples/testee_client/SConscript',variant_dir = builddir + 'testee_client',duplicate = 0)
 
-# scratch_client
-scratch_client = SConscript('#/examples/scratch_client/SConscript',variant_dir = builddir + 'scratch_client',duplicate = 0)
-
-# scratch_server
-scratch_server = SConscript('#/examples/scratch_server/SConscript',variant_dir = builddir + 'scratch_server',duplicate = 0)
-
-
-# debug_client
-debug_client = SConscript('#/examples/debug_client/SConscript',variant_dir = builddir + 'debug_client',duplicate = 0)
-
-# debug_server
-debug_server = SConscript('#/examples/debug_server/SConscript',variant_dir = builddir + 'debug_server',duplicate = 0)
+# utility_client
+utility_client = SConscript('#/examples/utility_client/SConscript',variant_dir = builddir + 'utility_client',duplicate = 0)
 
 # subprotocol_server
 subprotocol_server = SConscript('#/examples/subprotocol_server/SConscript',variant_dir = builddir + 'subprotocol_server',duplicate = 0)
 
-# telemetry_server
-telemetry_server = SConscript('#/examples/telemetry_server/SConscript',variant_dir = builddir + 'telemetry_server',duplicate = 0)
-
 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,217 +1,12 @@
 HEAD
-- Feature: Basic support for the permessage-deflate extension. #344
-- Improvement: Better automatic std::chrono feature detection for Visual Studio
-- Improvement: Major refactoring to bundled CMake build system. CMake can now be used to
-  build all of the examples and the test suite. Thank you Thijs Wenker for a significant
-  portion of this code. #378, #435, #449
-- Bug: Fix memory leak when init_asio produces an error. #454 Thank you Mark Grimes for
-  reporting and fixing.
-- Bug: Fix crash when processing a specially crafted HTTP header. Thank you Eli Fidler for
-  reporting, test cases, and a patch. #456
-
-0.6.0
-- MINOR BREAKING TRANSPORT POLICY CHANGE: Custom transport policies will now be
-  required to include a new method `void set_uri(uri_ptr u)`. An implementation
-  is not required. The stub transport policy includes an example stub method
-  that can be added to any existing custom transport policy to fulfill this
-  requirement. This does not affect anyone using the bundled transports or
-  configs.
-- MINOR BREAKING SOCKET POLICY CHANGE: Custom asio transport socket policies 
-  will now be required to include a new method `void set_uri(uri_ptr u)`. Like
-  with the transport layer, an implementation is not required. This does not 
-  affect anyone using the bundled socket policies.
-- MINOR BREAKING DEPENDENCY CHANGE: When using Boost versions greater than or 
-  equal to 1.49 in C++03 mode, `libboost-chrono` is needed now instead of 
-  `libboost-date_time`. Users with C++11 compilers or using Boost versions 1.48
-  and earlier are not affected. Note: This change affects the bundled unit test
-  suite.
-- Feature: WebSocket++ Asio transport policy can now be used with the standalone
-  version of Asio (1.8.0+) when a C++11 compiler and standard library are 
-  present. This means that it is possible now to use WebSocket++'s Asio
-  transport entirely without Boost. Thank you Robert Seiler for proof of concept
-  code that was used as a guide for this implementation. Fixes #324 
-- Feature: Adds a vectored/scatter-gather write handler to the iostream
-  transport.
-- Feature: Adds the ability to defer sending an HTTP response until sometime
-  after the `http_handler` is run. This allows processing of long running http
-  handlers to defer their response until it is ready without blocking the
-  network thread. references #425
-- Improvement: `echo_server_tls` has been update to demonstrate how to configure
-  it for Mozilla's recommended intermediate and modern TLS security profiles.
-- Improvement: `endpoint::set_timer` now uses a steady clock provided by 
-  `boost::chrono` or `std::chrono` where available instead of the non-monotonic
-  system clock. Thank you breyed for reporting. fixes #241
-- Improvement: Outgoing TLS connections to servers using the SNI extension to
-  choose a certificate will now work. Thank you moozzyk for reporting. 
-  Fixes #400
-- Improvement: Removes an unnecessary mutex lock in `get_con_from_hdl`.
-- Cleanup: Asio transport policy has been refactored to remove many Boost
-  dependencies. On C++03 compilers the `boost::noncopyable` dependency has been
-  removed and the `boost::date_time` dependency has been replaced with the newer
-  `boost::chrono` when possible. On C++11 compilers the `boost::aligned_storage`
-  and `boost::date_time` dependencies are gone, replaced with equivalent C++11
-  standard library features.
-- Bug: Fixes a potential dangling pointer and inconsistent error message
-  handling in `websocketpp::exception`. #432 Thank you Tom Swirly for the fix.
-
-0.5.1 - 2015-02-27
-- Bug: Fixes an issue where some frame data was counted against the max header
-  size limit, resulting in connections that included a lot of frame data
-  immediately after the opening handshake to fail.
-- Bug: Fix a typo in the name of the set method for `max_http_body_size`. #406
-  Thank you jplatte for reporting.
-
-0.5.0 - 2015-01-22
-- BREAKING UTILITY CHANGE: Deprecated methods `http::parser::parse_headers`,
-  `http::response::parse_complete`, and `http::request::parse_complete` have
-  been removed.
-- Security: Disabled SSLv3 in example servers.
-- Feature: Adds basic support for accessing HTTP request bodies in the http
-  handler. #181
-- Feature: Adds the ability to register a shutdown handler when using the
-  iostream transport. This provides a clean interface for triggering the shut
-  down of external sockets and other cleanup without hooking in to higher level
-  WebSocket handlers.
-- Feature: Adds the ability to register a write handler when using the iostream
-  transport. This handler can be used to handle transport output in place of
-  registering an ostream to write to.
-- Feature: Adds a new logging policy that outputs to syslog. #386 Thank you Tom
-  Hughes for submitting the initial version of this policy.
-- Improvement: Message payload logging now prints text for text messages rather
-  than binary.
-- Improvement: Overhaul of handshake state machine. Should make it impossible
-  for exceptions to bubble out of transport methods like `io_service::run`.
-- Improvement: Overhaul of handshake error reporting. Fail handler error codes
-  will be more detailed and precise. Adds new [fail] and [http] logging channels
-  that log failed websocket connections and successful HTTP connections
-  respectively. A new aggregate channel package, `alevel::access_core`, allows
-  enabling connect, disconnect, fail, and http together. Successful HTTP
-  connections will no longer trigger a fail handler.
-- Improvement: Ability to terminate connection during an http handler to cleanly
-  suppress the default outgoing HTTP response.
-- Documentation: Add Sending & Receiving Messages step to chapter one of the
-  `utility_client` tutorial. Update `utility_client` example to match.
-- Cleanup: Removes unused files & STL includes. Adds required STL includes.
-  Normalizes include order.
-- Bug: Fixes a fatal state error when a handshake response is completed
-  immediately after that handshake times out. #389
-- Bug: MinGW fixes; C++11 feature detection, localtime use. #393 Thank you
-  Schebb for reporting, code, and testing.
-- Bug: Fixes an issue where `websocketpp::exception::what()` could return an out
-  of scope pointer. #397 Thank you fabioang for reporting.
-- Bug: Fixes an issue where endpoints were not reset properly after a call to
-  `endpoint::listen` failed. #390 Thank you wyyqyl for reporting.
-
-0.4.0 - 2014-11-04
-- BREAKING API CHANGE: All WebSocket++ methods now throw an exception of type
-  `websocketpp::exception` which derives from `std::exception`. This normalizes
-  all exception types under the standard exception hierarchy and allows
-  WebSocket++ exceptions to be caught in the same statement as others. The error
-  code that was previously thrown is wrapped in the exception object and can be
-  accessed via the `websocketpp::exception::code()` method.
-- BREAKING API CHANGE: Custom logging policies have some new required
-  constructors that take generic config settings rather than pointers to
-  std::ostreams. This allows writing logging policies that do not involve the
-  use of std::ostream. This does not affect anyone using the built in logging
-  policies.
-- BREAKING UTILITY CHANGE: `websocketpp::lib::net::htonll` and
-  `websocketpp::lib::net::ntohll` have been prefixed with an underscore to avoid
-  conflicts with similarly named macros in some operating systems. If you are
-  using the WebSocket++ provided 64 bit host/network byte order functions you
-  will need to switch to the prefixed versions.
-- BREAKING UTILITY CHANGE: The signature of `base64_encode` has changed from
-  `websocketpp::base64_encode(unsigned char const *, unsigned int)` to
-  `websocketpp::base64_encode(unsigned char const *, size_t)`.
-- BREAKING UTILITY CHANGE: The signature of `sha1::calc` has changed from
-  `websocketpp::sha1::calc(void const *, int, unsigned char *)` to
-  `websocketpp::sha1::calc(void const *, size_t, unsigned char *)`
-- Feature: Adds incomplete `minimal_server` and `minimal_client` configs that
-  can be used to build custom configs without pulling in the dependencies of
-  `core` or `core_client`. These configs will offer a stable base config to
-  future-proof custom configs.
-- Improvement: Core library no longer has std::iostream as a dependency.
-  std::iostream is still required for the optional iostream logging policy and
-  iostream transport.
-- Bug: C++11 Chrono support was being incorrectly detected by the `boost_config`
-  header. Thank you Max Dmitrichenko for reporting and a patch.
-- Bug: use of `std::put_time` is now guarded by a unique flag rather than a
-  chrono library flag. Thank you Max Dmitrichenko for reporting.
-- Bug: Fixes non-thread safe use of std::localtime. #347 #383
-- Compatibility: Adjust usage of std::min to be more compatible with systems
-  that define a min(...) macro.
-- Compatibility: Removes unused parameters from all library, test, and example
-  code. This assists with those developing with -Werror and -Wunused-parameter
-  #376
-- Compatibility: Renames ntohll and htonll methods to avoid conflicts with
-  platform specific macros. #358 #381, #382 Thank you logotype, unphased,
-  svendjo
-- Cleanup: Removes unused functions, fixes variable shadow warnings, normalizes
-  all whitespace in library, examples, and tests to 4 spaces. #376
-
-0.3.0 - 2014-08-10
-- Feature: Adds `start_perpetual` and `stop_perpetual` methods to asio transport
-  These may be used to replace manually managed `asio::io_service::work` objects
-- Feature: Allow setting pong and handshake timeouts at runtime.
-- Feature: Allows changing the listen backlog queue length.
-- Feature: Split tcp init into pre and post init.
-- Feature: Adds URI method to extract query string from URI. Thank you Banaan
-  for code. #298
-- Feature: Adds a compile time switch to asio transport config to disable
-  certain multithreading features (some locks, asio strands)
-- Feature: Adds the ability to pause reading on a connection. Paused connections
-  will not read more data from their socket, allowing TCP flow control to work
-  without blocking the main thread.
-- Feature: Adds the ability to specify whether or not to use the `SO_REUSEADDR`
-  TCP socket option. The default for this value has been changed from `true` to
-  `false`.
-- Feature: Adds the ability to specify a maximum message size.
-- Feature: Adds `close::status::get_string(...)` method to look up a human
-  readable string given a close code value.
-- Feature: Adds `connection::read_all(...)` method to iostream transport as a
-  convenience method for reading all data into the connection buffer without the
-  end user needing to manually loop on `read_some`.
-- Improvement: Open, close, and pong timeouts can be disabled entirely by
-  setting their duration to 0.
-- Improvement: Numerous performance improvements. Including: tuned default
-  buffer sizes based on profiling, caching of handler binding for async
-  reads/writes, non-malloc allocators for read/write handlers, disabling of a
-  number of questionably useful range sanity checks in tight inner loops.
-- Improvement: Cleaned up the handling of TLS related errors. TLS errors will
-  now be reported with more detail on the info channel rather than all being
-  `tls_short_read` or `pass_through`. In addition, many cases where a TLS short
-  read was in fact expected are no longer classified as errors. Expected TLS
-  short reads and quasi-expected socket shutdown related errors will no longer
-  be reported as unclean WebSocket shutdowns to the application. Information
-  about them will remain in the info error channel for debugging purposes.
-- Improvement: `start_accept` and `listen` errors are now reported to the caller
-  either via an exception or an ec parameter.
-- Improvement: Outgoing writes are now batched for improved message throughput
-  and reduced system call and TCP frame overhead.
-- Bug: Fix some cases of calls to empty lib::function objects.
-- Bug: Fix memory leak of connection objects due to cached handlers holding on to
-  reference counted pointers. #310 Thank you otaras for reporting.
-- Bug: Fix issue with const endpoint accessors (such as `get_user_agent`) not
-  compiling due to non-const mutex use. #292 Thank you logofive for reporting.
-- Bug: Fix handler allocation crash with multithreaded `io_service`.
-- Bug: Fixes incorrect whitespace handling in header parsing. #301 Thank you
-  Wolfram Schroers for reporting
-- Bug: Fix a crash when parsing empty HTTP headers. Thank you Thingol for
-  reporting.
-- Bug: Fix a crash following use of the `stop_listening` function. Thank you
-  Thingol for reporting.
-- Bug: Fix use of variable names that shadow function parameters. The library
-  should compile cleanly with -Wshadow now. Thank you giszo for reporting. #318
-- Bug: Fix an issue where `set_open_handshake_timeout` was ignored by server
-  code. Thank you Robin Rowe for reporting.
-- Bug: Fix an issue where custom timeout values weren't being propagated from
-  endpoints to new connections.
-- Bug: Fix a number of memory leaks related to server connection failures. #323
-  #333 #334 #335 Thank you droppy and aydany for reporting and patches.
-  reporting.
-- Compatibility: Fix compile time conflict with Visual Studio's MIN/MAX macros.
-  Thank you Robin Rowe for reporting.
-- Documentation: Examples and test suite build system now defaults to clang on
-  OS X
+- Adds URI method to extract query string from URI. Thank you Banaan for code.
+  #298
+- Numerous performance improvements. Including: tuned default buffer sizes based
+  on profiling, caching of handler binding for async reads/writes, non-malloc
+  allocators for read/write handlers, disabling of a number of questionably
+  useful range sanity checks in tight inner loops.
+- Adds a compile time switch to asio transport config to disable certain
+  multithreading features (some locks, asio strands)
 
 0.3.0-alpha4 - 2013-10-11
 - HTTP requests ending normally are no longer logged as errors. Thank you Banaan
@@ -278,7 +73,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

cmake/CMakeHelpers.cmake

@@ -13,7 +13,7 @@ macro (print_used_build_config)
     message ("")
     message (STATUS "WEBSOCKETPP_BOOST_LIBS        = ${WEBSOCKETPP_BOOST_LIBS}")
     message (STATUS "WEBSOCKETPP_PLATFORM_LIBS     = ${WEBSOCKETPP_PLATFORM_LIBS}")
-    message (STATUS "WEBSOCKETPP_PLATFORM_TLS_LIBS = ${WEBSOCKETPP_PLATFORM_TLS_LIBS}")
+    message (STATUS "WEBSOCKETPP_PLATFORM_TSL_LIBS = ${WEBSOCKETPP_PLATFORM_TSL_LIBS}")
     message ("") 
 endmacro ()
 
@@ -76,16 +76,3 @@ endmacro ()
 macro (link_openssl)
     target_link_libraries (${TARGET_NAME} ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
 endmacro ()
-
-macro (link_zlib)
-	target_link_libraries (${TARGET_NAME} ${ZLIB_LIBRARIES})
-endmacro ()
-
-macro (include_subdirs PARENT)
-    file (GLOB SDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "${PARENT}/*")
-    foreach (SUBDIR ${SDIRS})
-        if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/CMakeLists.txt")
-            add_subdirectory ("${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}")
-        endif ()
-    endforeach ()
-endmacro()

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/CMakeLists.txt

@@ -0,0 +1,6 @@
+file (GLOB SDIRS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *)
+foreach (SUBDIR ${SDIRS})
+    if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${SUBDIR}/CMakeLists.txt")
+        add_subdirectory (${SUBDIR})
+    endif ()
+endforeach ()

examples/associative_storage/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (associative_storage)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

examples/broadcast_server/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (broadcast_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

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>
@@ -35,8 +34,7 @@ enum action_type {
 
 struct action {
     action(action_type t, connection_hdl h) : type(t), hdl(h) {}
-    action(action_type t, connection_hdl h, server::message_ptr m)
-      : type(t), hdl(h), msg(m) {}
+    action(action_type t, server::message_ptr m) : type(t), msg(m) {}
 
     action_type type;
     websocketpp::connection_hdl hdl;
@@ -60,13 +58,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;
         }
     }
 
@@ -90,7 +92,7 @@ public:
         // queue message up for sending by processing thread
         unique_lock<mutex> lock(m_action_lock);
         //std::cout << "on_message" << std::endl;
-        m_actions.push(action(MESSAGE,hdl,msg));
+        m_actions.push(action(MESSAGE,msg));
         lock.unlock();
         m_action_cond.notify_one();
     }
@@ -109,13 +111,13 @@ public:
             lock.unlock();
 
             if (a.type == SUBSCRIBE) {
-                unique_lock<mutex> con_lock(m_connection_lock);
+                unique_lock<mutex> lock(m_connection_lock);
                 m_connections.insert(a.hdl);
             } else if (a.type == UNSUBSCRIBE) {
-                unique_lock<mutex> con_lock(m_connection_lock);
+                unique_lock<mutex> lock(m_connection_lock);
                 m_connections.erase(a.hdl);
             } else if (a.type == MESSAGE) {
-                unique_lock<mutex> con_lock(m_connection_lock);
+                unique_lock<mutex> lock(m_connection_lock);
 
                 con_list::iterator it;
                 for (it = m_connections.begin(); it != m_connections.end(); ++it) {
@@ -127,7 +129,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 +141,18 @@ private:
 };
 
 int main() {
-    try {
-    broadcast_server server_instance;
+	try {
+	broadcast_server server;
 
-    // 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));
 
-    // Run the asio loop with the main thread
-    server_instance.run(9002);
+	// Run the asio loop with the main thread
+	server.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/CMakeLists.txt

@@ -1,17 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-if (OPENSSL_FOUND)
-
-init_target (debug_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_openssl()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()

examples/debug_client/SConscript

@@ -1,24 +0,0 @@
-## Debug client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env_cpp11.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env.Program('debug_client', ["debug_client.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')

examples/debug_client/debug_client.cpp

@@ -1,166 +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.
- */
-
-/** ====== WARNING ========
- * This example is presently used as a scratch space. It may or may not be broken
- * at any given time.
- */
-
-#include <websocketpp/config/asio_client.hpp>
-
-#include <websocketpp/client.hpp>
-
-#include <iostream>
-#include <chrono>
-
-typedef websocketpp::client<websocketpp::config::asio_client> client;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr;
-typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
-typedef client::connection_ptr connection_ptr;
-
-
-
-class perftest {
-public:
-    typedef perftest type;
-    typedef std::chrono::duration<int,std::micro> dur_type;
-
-    perftest () {
-        m_endpoint.set_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.set_error_channels(websocketpp::log::elevel::all);
-
-        // Initialize ASIO
-        m_endpoint.init_asio();
-
-        // Register our handlers
-        m_endpoint.set_socket_init_handler(bind(&type::on_socket_init,this,::_1));
-        //m_endpoint.set_tls_init_handler(bind(&type::on_tls_init,this,::_1));
-        m_endpoint.set_message_handler(bind(&type::on_message,this,::_1,::_2));
-        m_endpoint.set_open_handler(bind(&type::on_open,this,::_1));
-        m_endpoint.set_close_handler(bind(&type::on_close,this,::_1));
-        m_endpoint.set_fail_handler(bind(&type::on_fail,this,::_1));
-    }
-
-    void start(std::string uri) {
-        websocketpp::lib::error_code ec;
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
-        }
-
-        //con->set_proxy("http://humupdates.uchicago.edu:8443");
-
-        m_endpoint.connect(con);
-
-        // Start the ASIO io_service run loop
-        m_start = std::chrono::high_resolution_clock::now();
-        m_endpoint.run();
-    }
-
-    void on_socket_init(websocketpp::connection_hdl) {
-        m_socket_init = std::chrono::high_resolution_clock::now();
-    }
-
-    context_ptr on_tls_init(websocketpp::connection_hdl) {
-        m_tls_init = std::chrono::high_resolution_clock::now();
-        context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tlsv1);
-
-        try {
-            ctx->set_options(boost::asio::ssl::context::default_workarounds |
-                             boost::asio::ssl::context::no_sslv2 |
-                             boost::asio::ssl::context::no_sslv3 |
-                             boost::asio::ssl::context::single_dh_use);
-        } catch (std::exception& e) {
-            std::cout << e.what() << std::endl;
-        }
-        return ctx;
-    }
-
-    void on_fail(websocketpp::connection_hdl hdl) {
-        client::connection_ptr con = m_endpoint.get_con_from_hdl(hdl);
-        
-        std::cout << "Fail handler" << std::endl;
-        std::cout << con->get_state() << std::endl;
-        std::cout << con->get_local_close_code() << std::endl;
-        std::cout << con->get_local_close_reason() << std::endl;
-        std::cout << con->get_remote_close_code() << std::endl;
-        std::cout << con->get_remote_close_reason() << std::endl;
-        std::cout << con->get_ec() << " - " << con->get_ec().message() << std::endl;
-    }
-
-    void on_open(websocketpp::connection_hdl hdl) {
-        m_open = std::chrono::high_resolution_clock::now();
-        m_endpoint.send(hdl, "", websocketpp::frame::opcode::text);
-    }
-    void on_message(websocketpp::connection_hdl hdl, message_ptr) {
-        m_message = std::chrono::high_resolution_clock::now();
-        m_endpoint.close(hdl,websocketpp::close::status::going_away,"");
-    }
-    void on_close(websocketpp::connection_hdl) {
-        m_close = std::chrono::high_resolution_clock::now();
-
-        std::cout << "Socket Init: " << std::chrono::duration_cast<dur_type>(m_socket_init-m_start).count() << std::endl;
-        std::cout << "TLS Init: " << std::chrono::duration_cast<dur_type>(m_tls_init-m_start).count() << std::endl;
-        std::cout << "Open: " << std::chrono::duration_cast<dur_type>(m_open-m_start).count() << std::endl;
-        std::cout << "Message: " << std::chrono::duration_cast<dur_type>(m_message-m_start).count() << std::endl;
-        std::cout << "Close: " << std::chrono::duration_cast<dur_type>(m_close-m_start).count() << std::endl;
-    }
-private:
-    client m_endpoint;
-
-    std::chrono::high_resolution_clock::time_point m_start;
-    std::chrono::high_resolution_clock::time_point m_socket_init;
-    std::chrono::high_resolution_clock::time_point m_tls_init;
-    std::chrono::high_resolution_clock::time_point m_open;
-    std::chrono::high_resolution_clock::time_point m_message;
-    std::chrono::high_resolution_clock::time_point m_close;
-};
-
-int main(int argc, char* argv[]) {
-    std::string uri = "wss://echo.websocket.org";
-
-    if (argc == 2) {
-        uri = argv[1];
-    }
-
-    try {
-        perftest endpoint;
-        endpoint.start(uri);
-    } catch (const std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
-    }
-}

examples/debug_server/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (debug_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

examples/debug_server/SConscript

@@ -1,23 +0,0 @@
-## Debug server example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
-   prgs += env_cpp11.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('debug_server', ["debug_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')

examples/debug_server/debug_server.cpp

@@ -1,174 +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.
- */
-
-/** ====== WARNING ========
- * This example is presently used as a scratch space. It may or may not be broken
- * at any given time.
- */
-
-#include <websocketpp/config/debug_asio_no_tls.hpp>
-
-// Custom logger
-#include <websocketpp/logger/syslog.hpp>
-
-#include <websocketpp/server.hpp>
-
-#include <iostream>
-
-////////////////////////////////////////////////////////////////////////////////
-///////////////// Custom Config for debugging custom policies //////////////////
-////////////////////////////////////////////////////////////////////////////////
-
-struct debug_custom : public websocketpp::config::debug_asio {
-    typedef debug_custom type;
-    typedef debug_asio base;
-
-    typedef base::concurrency_type concurrency_type;
-
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-
-    /// Custom Logging policies
-    /*typedef websocketpp::log::syslog<concurrency_type,
-        websocketpp::log::elevel> elog_type;
-    typedef websocketpp::log::syslog<concurrency_type,
-        websocketpp::log::alevel> alog_type;
-    */
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-
-    typedef base::rng_type rng_type;
-
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config>
-        transport_type;
-    
-    static const long timeout_open_handshake = 0;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-
-typedef websocketpp::server<debug_custom> server;
-
-using websocketpp::lib::placeholders::_1;
-using websocketpp::lib::placeholders::_2;
-using websocketpp::lib::bind;
-
-// pull out the type of messages sent by our config
-typedef server::message_ptr message_ptr;
-
-bool validate(server *, websocketpp::connection_hdl) {
-    //sleep(6);
-    return true;
-}
-
-void on_http(server* s, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    std::string res = con->get_request_body();
-
-    std::stringstream ss;
-    ss << "got HTTP request with " << res.size() << " bytes of body data.";
-
-    con->set_body(ss.str());
-    con->set_status(websocketpp::http::status_code::ok);
-}
-
-void on_fail(server* s, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
-    std::cout << "Fail handler: " << con->get_ec() << " " << con->get_ec().message()  << std::endl;
-}
-
-void on_close(websocketpp::connection_hdl) {
-    std::cout << "Close handler" << std::endl;
-}
-
-// Define a callback to handle incoming messages
-void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    std::cout << "on_message called with hdl: " << hdl.lock().get()
-              << " and message: " << msg->get_payload()
-              << std::endl;
-
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (const websocketpp::lib::error_code& e) {
-        std::cout << "Echo failed because: " << e
-                  << "(" << e.message() << ")" << std::endl;
-    }
-}
-
-int main() {
-    // Create a server endpoint
-    server echo_server;
-
-    try {
-        // Set logging settings
-        echo_server.set_access_channels(websocketpp::log::alevel::all);
-        echo_server.clear_access_channels(websocketpp::log::alevel::frame_payload);
-
-        // Initialize ASIO
-        echo_server.init_asio();
-        echo_server.set_reuse_addr(true);
-
-        // Register our message handler
-        echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2));
-
-        echo_server.set_http_handler(bind(&on_http,&echo_server,::_1));
-        echo_server.set_fail_handler(bind(&on_fail,&echo_server,::_1));
-        echo_server.set_close_handler(&on_close);
-
-        echo_server.set_validate_handler(bind(&validate,&echo_server,::_1));
-
-        // Listen on port 9012
-        echo_server.listen(9012);
-
-        // Start the server accept loop
-        echo_server.start_accept();
-
-        // Start the ASIO io_service run loop
-        echo_server.run();
-    } catch (const std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
-    }
-}

examples/dev/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-#init_target (dev)
-
-#build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-#link_boost ()
-#final_target ()
-
-#set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

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/CMakeLists.txt

@@ -8,5 +8,3 @@ build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 
 link_boost ()
 final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

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

@@ -19,13 +19,6 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
               << " and message: " << msg->get_payload()
               << std::endl;
 
-    // check for a special command to instruct the server to stop listening so
-    // it can be cleanly exited.
-    if (msg->get_payload() == "stop-listening") {
-        s->stop_listening();
-        return;
-    }
-
     try {
         s->send(hdl, msg->get_payload(), msg->get_opcode());
     } catch (const websocketpp::lib::error_code& e) {
@@ -35,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);
@@ -55,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,18 +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 ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-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/CMakeLists.txt

@@ -12,7 +12,4 @@ build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 link_boost ()
 link_openssl()
 final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
 endif()

examples/echo_server_tls/dh.pem

@@ -1,8 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIIBCAKCAQEAqxMGKZB8YNV8WQnbJWwwwmifc+PfVRtd1FN5v5aQSsf6dpjX3Zlh
-N1NmgecsQyg4u2EWe4Umta10QzCgYaxf6QdTCg7iprLzFNw7IvWYbQ6du12NMGDr
-hmwA6KQKwbTgPL6mSlSlcK2wTP2FzxDTNffFu10cB/6Fj4kdQjPG0c1Koz/z7OOq
-BuDElJLClS8rjp3z1xvrc7gX95dFa2KaKgOAYDkpe8tfHRhHfJeIVS/whH9hzx6r
-OBg+E5K9JyvayrUoKgPeptRKCqo8A4YevtMLpRxMup0nMUgAIv6+BGTwPAFpwgl/
-8UIVcvjh1v95PwGDM/Q8yvIBJznBYk/e2wIBAg==
------END DH PARAMETERS-----

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:
@@ -25,13 +25,13 @@
  *
  */
 
-#ifndef WEBSOCKETPP_COMMON_ASIO_SSL_HPP
-#define WEBSOCKETPP_COMMON_ASIO_SSL_HPP
+#ifndef WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
+#define WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP
 
-#ifdef ASIO_STANDALONE
-    #include <asio/asio/ssl.hpp>
-#else
-    #include <boost/asio/ssl.hpp>
-#endif
+class echo_handler : public server::handler {
+	void on_message(connection_ptr con, std::string msg) {
+		con->write(msg);
+	}
+};
 
-#endif // WEBSOCKETPP_COMMON_ASIO_SSL_HPP
+#endif // WEBSOCKETPP_ECHO_SERVER_HANDLER_HPP

examples/echo_server_tls/echo_server_tls.cpp

@@ -27,89 +27,46 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
     }
 }
 
-void on_http(server* s, websocketpp::connection_hdl hdl) {
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
-    con->set_body("Hello World!");
-    con->set_status(websocketpp::http::status_code::ok);
-}
-
 std::string get_password() {
     return "test";
 }
 
-// See https://wiki.mozilla.org/Security/Server_Side_TLS for more details about
-// the TLS modes. The code below demonstrates how to implement both the modern
-enum tls_mode {
-    MOZILLA_INTERMEDIATE = 1,
-    MOZILLA_MODERN = 2
-};
-
-context_ptr on_tls_init(tls_mode mode, websocketpp::connection_hdl hdl) {
+context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
     std::cout << "on_tls_init called with hdl: " << hdl.lock().get() << std::endl;
-    std::cout << "using TLS mode: " << (mode == MOZILLA_MODERN ? "Mozilla Modern" : "Mozilla Intermediate") << std::endl;
-    context_ptr ctx = websocketpp::lib::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::sslv23);
+    context_ptr ctx(new boost::asio::ssl::context(boost::asio::ssl::context::tlsv1));
 
     try {
-        if (mode == MOZILLA_MODERN) {
-            // Modern disables TLSv1
-            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::no_tlsv1 |
-                             boost::asio::ssl::context::single_dh_use);
-        } else {
-            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_options(boost::asio::ssl::context::default_workarounds |
+                         boost::asio::ssl::context::no_sslv2 |
+                         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);
-        
-        // Example method of generating this file:
-        // `openssl dhparam -out dh.pem 2048`
-        // Mozilla Intermediate suggests 1024 as the minimum size to use
-        // Mozilla Modern suggests 2048 as the minimum size to use.
-        ctx->use_tmp_dh_file("dh.pem");
-        
-        std::string ciphers;
-        
-        if (mode == MOZILLA_MODERN) {
-            ciphers = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!3DES:!MD5:!PSK";
-        } else {
-            ciphers = "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA";
-        }
-        
-        if (SSL_CTX_set_cipher_list(ctx->native_handle() , ciphers.c_str()) != 1) {
-            std::cout << "Error setting cipher list" << std::endl;
-        }
     } catch (std::exception& e) {
-        std::cout << "Exception: " << e.what() << std::endl;
+        std::cout << e.what() << std::endl;
     }
     return ctx;
 }
 
 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_http_handler(bind(&on_http,&echo_server,::_1));
-    echo_server.set_tls_init_handler(bind(&on_tls_init,MOZILLA_INTERMEDIATE,::_1));
+    echo_server.set_tls_init_handler(bind(&on_tls_init,::_1));
 
-    // Listen on port 9002
-    echo_server.listen(9002);
 
-    // Start the server accept loop
-    echo_server.start_accept();
+	// Listen on port 9002
+	echo_server.listen(9002);
 
-    // Start the ASIO io_service run loop
-    echo_server.run();
+	// Start the server accept loop
+	echo_server.start_accept();
+
+	// Start the ASIO io_service run loop
+	echo_server.run();
 
 }

examples/echo_server_tls/server.pem

@@ -1,55 +1,58 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA77v5VbFaq+geVd/RCLXoKTWj/LgXGjiOXBpJZca3o5edi7N1
-Ej41/13jfZ4OxgFIRFAALd+fU4NsObXzskth3rJLmJjUtGajRIPqF2IUVjFMmybQ
-9dUDSqPzd/bG+ul0DP7DNuiBcLC8XNC3/kchPUzVq9gNDk56jXn87kMoIkVXBWQS
-Rwk0yCtELSfwxxRCrGKgQDfXnRdwmkPe42DmKtdGksXJlUhP1UVTAXaSw1Nz64LV
-9bJje/eoDsSe4OxifVVToE6ZxIW+r1jVgrcupeYXQrSHIztl2U/rx2JkGMN0eS+P
-qrsJmkmRBN1cpgmvSV7WoM3hj6Eq71z4Dfv6EwIDAQABAoIBAEXAL19bZsI1mv3p
-TOx34MB8tuXEuhQK+ICbtVdDZhLW/iOzZxCTwSo3qwTVg/7gSKJ3lFXEhprJ1idE
-ZU8u157vyUbw0JJceoxoxSdghgI9/cf2lz2vaHHDGgeBaYt/eSB+z1WeeGrNQUDQ
-CXiWQXmQbWq+Ra4v70BSieDY8UhmzCTRhvfZV80vaY/4SnHxJ9C8Nu8/An7U3pwq
-ccfTaWMp3Q5ztmEnExF6/b1SUsnI8rzFovw/4C50AU09N/Z6zZVFsXgJAT2Kd1Tx
-HfP1vUkWZ/TJ6kcmVIV9U3uMcedBD8Rb/3M0Qdp+eymQ+1oYQ3K3/a2RlUQIeXzf
-hRbE4wECgYEA/WyULrwBsvSMPqK0K9pZpv921Yl6d4bGnpxKze7ltc9o5/LsU35q
-8u29Es7cPyhyUDOsPW8v2CNjw54t+eFGsu59bBvXZNz5gB7hTUEyLntB24cO5PmN
-kVExcMDFC6NgPaauBtUhODievKJ2C8P7sRJDAVKE9KkavDddU7nSEjMCgYEA8ivG
-AqwNXYsiIFjAo4uj3kuBFt8LU/q4m6GXI+9qyxfiJjuF1dROx5qaQGiE85VaBFUu
-gpbnjZH7s+BBgoaQhrB4i6mztljdN1KKuAlnjhB+Fywg8m8N9lAi3wIaxnIEqDkU
-vFiIFPTBCk0U7IZ/OyCrKPQTE9ApWHfBwA/vWKECgYBQixrJg61SkBCms5Vpvprx
-zY2aLniC1o33yRqpOr09PG9OENH1c19QWCjYenBbjmJOhS2/1L+zBQRnHrXkDion
-Ik8wdeTORMDzbF0U7ZyiU0BKIjGkqn/I6LI68LlvinxC+9+hgkltkek5cLTt5lrv
-Gyu6ltx02e4KVdpOiuduKwKBgQC3U0PWigCkK8ttyUIrjG5Evcu/UKH2tPpDdpQ/
-8+JYVIAyiSTLtqjcmcDjuTvMWeeHGCTZXvtzRGvSw5VUBiIqlDTtJU6SX7s3QhkZ
-MKVf+kQ5roJShJeBOzDquWEjkPTNlEiKPErn8lCgR7HrS/XNAPIRUpOOkCp8ekwF
-5Qo/gQKBgAue3TeCeIzxh4PxSAk39Uaj+AaLvlYg8C+ucEodCNQZnJ7jOO0hHkfT
-NvZBes0VukCGlBLOGRQtC3kgtyrerscnDiZOhdnJrhPIdNPC0k/p/uAfh7+C5Sxm
-rCEL0S7kORdEjlIGd5j6ZEN/HZe8FyOYSjbFAoJSlAId9WMSxycQ
+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-----
-MIIEpzCCA4+gAwIBAgIJAMlCHvwnJ+F/MA0GCSqGSIb3DQEBCwUAMIGTMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCSUwxEDAOBgNVBAcTB0NoaWNhZ28xGTAXBgNVBAoT
-EFdlYlNvY2tldCsrIERlbW8xIjAgBgNVBAMTGXV0aWxpdGllcy53ZWJzb2NrZXRw
-cC5vcmcxJjAkBgkqhkiG9w0BCQEWF3dlYnNvY2tldHBwQHphcGhveWQuY29tMB4X
-DTE1MDQyNTE1NTk1M1oXDTE4MDMyODE1NTk1M1owgZMxCzAJBgNVBAYTAlVTMQsw
-CQYDVQQIEwJJTDEQMA4GA1UEBxMHQ2hpY2FnbzEZMBcGA1UEChMQV2ViU29ja2V0
-KysgRGVtbzEiMCAGA1UEAxMZdXRpbGl0aWVzLndlYnNvY2tldHBwLm9yZzEmMCQG
-CSqGSIb3DQEJARYXd2Vic29ja2V0cHBAemFwaG95ZC5jb20wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDvu/lVsVqr6B5V39EItegpNaP8uBcaOI5cGkll
-xrejl52Ls3USPjX/XeN9ng7GAUhEUAAt359Tg2w5tfOyS2HeskuYmNS0ZqNEg+oX
-YhRWMUybJtD11QNKo/N39sb66XQM/sM26IFwsLxc0Lf+RyE9TNWr2A0OTnqNefzu
-QygiRVcFZBJHCTTIK0QtJ/DHFEKsYqBAN9edF3CaQ97jYOYq10aSxcmVSE/VRVMB
-dpLDU3PrgtX1smN796gOxJ7g7GJ9VVOgTpnEhb6vWNWCty6l5hdCtIcjO2XZT+vH
-YmQYw3R5L4+quwmaSZEE3VymCa9JXtagzeGPoSrvXPgN+/oTAgMBAAGjgfswgfgw
-HQYDVR0OBBYEFAWNBET93ZzSukXGkuGb93CfmUkDMIHIBgNVHSMEgcAwgb2AFAWN
-BET93ZzSukXGkuGb93CfmUkDoYGZpIGWMIGTMQswCQYDVQQGEwJVUzELMAkGA1UE
-CBMCSUwxEDAOBgNVBAcTB0NoaWNhZ28xGTAXBgNVBAoTEFdlYlNvY2tldCsrIERl
-bW8xIjAgBgNVBAMTGXV0aWxpdGllcy53ZWJzb2NrZXRwcC5vcmcxJjAkBgkqhkiG
-9w0BCQEWF3dlYnNvY2tldHBwQHphcGhveWQuY29tggkAyUIe/Ccn4X8wDAYDVR0T
-BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEA2DRQSDmo2Q5t8MEjp6jddRIFts5t
-BDBWPSwJ0qvmheFt53MuLds2hhvMn42WGrKtVJiLiDyOWuUZ41REJZb1uaissUuY
-r9pLuP5QLdibx7+/30iDEY0OGTgtSTfgwNx8bIApBSHoZEN3/HaikqplBng2+6u/
-kTe6UnRrBJ+8JOGl+duhCXNPeSyLa2NcrxE9XpWC/k1kC9MTUF+2NuqCtK3zO8ci
-p0mqARWDSrEBYISh3dAOgDFrcX6zj+0MK+iswu3ijEdItGAjxjlQ2t4XT1T/CDbc
-ysHg04TJw7v682+v124GrnrAPYUK34OK8kFVJ60SNYRUi7euOCdTM4Lwkw==
+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/enriched_storage/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (enriched_storage)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

examples/handler_switch/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (handler_switch)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

examples/iostream_server/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (iostream_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

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/CMakeLists.txt

@@ -8,5 +8,3 @@ build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 
 link_boost ()
 final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

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;
 }
 
@@ -13,8 +13,6 @@ int main() {
     server print_server;
 
     print_server.set_message_handler(&on_message);
-    print_server.set_access_channels(websocketpp::log::alevel::all);
-    print_server.set_error_channels(websocketpp::log::elevel::all);
 
     print_server.init_asio();
     print_server.listen(9002);

examples/scratch_client/SConscript

@@ -1,24 +0,0 @@
-## Scratch client example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
-   prgs += env_cpp11.Program('scratch_client', ["scratch_client.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
-   prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
-   
-Return('prgs')

examples/scratch_client/scratch_client.cpp

@@ -1,270 +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();
-    }
-
-    websocketpp::connection_hdl get_hdl() const {
-        return m_hdl;
-    }
-    
-    int get_id() const {
-        return m_id;
-    }
-    
-    std::string get_status() const {
-        return m_status;
-    }
-
-    friend std::ostream & operator<< (std::ostream & out, connection_metadata const & data);
-private:
-    int m_id;
-    websocketpp::connection_hdl m_hdl;
-    std::string m_status;
-    std::string m_uri;
-    std::string m_server;
-    std::string m_error_reason;
-};
-
-std::ostream & operator<< (std::ostream & out, connection_metadata const & data) {
-    out << "> URI: " << data.m_uri << "\n"
-        << "> Status: " << data.m_status << "\n"
-        << "> Remote Server: " << (data.m_server.empty() ? "None Specified" : data.m_server) << "\n"
-        << "> Error/close reason: " << (data.m_error_reason.empty() ? "N/A" : data.m_error_reason);
-
-    return out;
-}
-
-class websocket_endpoint {
-public:
-    websocket_endpoint () : m_next_id(0) {
-        m_endpoint.clear_access_channels(websocketpp::log::alevel::all);
-        m_endpoint.clear_error_channels(websocketpp::log::elevel::all);
-
-        m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
-
-        m_thread.reset(new websocketpp::lib::thread(&client::run, &m_endpoint));
-    }
-
-    ~websocket_endpoint() {
-        m_endpoint.stop_perpetual();
-        
-        for (con_list::const_iterator it = m_connection_list.begin(); it != m_connection_list.end(); ++it) {
-            if (it->second->get_status() != "Open") {
-                // Only close open connections
-                continue;
-            }
-            
-            std::cout << "> Closing connection " << it->second->get_id() << std::endl;
-            
-            websocketpp::lib::error_code ec;
-            m_endpoint.close(it->second->get_hdl(), websocketpp::close::status::going_away, "", ec);
-            if (ec) {
-                std::cout << "> Error closing connection " << it->second->get_id() << ": "  
-                          << ec.message() << std::endl;
-            }
-        }
-        
-        m_thread->join();
-    }
-
-    int connect(std::string const & uri) {
-        websocketpp::lib::error_code ec;
-
-        client::connection_ptr con = m_endpoint.get_connection(uri, ec);
-
-        if (ec) {
-            std::cout << "> Connect initialization error: " << ec.message() << std::endl;
-            return -1;
-        }
-
-        int new_id = m_next_id++;
-        connection_metadata::ptr metadata_ptr(new connection_metadata(new_id, con->get_handle(), uri));
-        m_connection_list[new_id] = metadata_ptr;
-
-        con->set_open_handler(websocketpp::lib::bind(
-            &connection_metadata::on_open,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_fail_handler(websocketpp::lib::bind(
-            &connection_metadata::on_fail,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-        con->set_close_handler(websocketpp::lib::bind(
-            &connection_metadata::on_close,
-            metadata_ptr,
-            &m_endpoint,
-            websocketpp::lib::placeholders::_1
-        ));
-
-        m_endpoint.connect(con);
-
-        return new_id;
-    }
-
-    void close(int id, websocketpp::close::status::value code, std::string reason) {
-        websocketpp::lib::error_code ec;
-        
-        con_list::iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            std::cout << "> No connection found with id " << id << std::endl;
-            return;
-        }
-        
-        m_endpoint.close(metadata_it->second->get_hdl(), code, reason, ec);
-        if (ec) {
-            std::cout << "> Error initiating close: " << ec.message() << std::endl;
-        }
-    }
-
-    connection_metadata::ptr get_metadata(int id) const {
-        con_list::const_iterator metadata_it = m_connection_list.find(id);
-        if (metadata_it == m_connection_list.end()) {
-            return connection_metadata::ptr();
-        } else {
-            return metadata_it->second;
-        }
-    }
-private:
-    typedef std::map<int,connection_metadata::ptr> con_list;
-
-    client m_endpoint;
-    websocketpp::lib::shared_ptr<websocketpp::lib::thread> m_thread;
-
-    con_list m_connection_list;
-    int m_next_id;
-};
-
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
-
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
-
-        if (input == "quit") {
-            done = true;
-        } else if (input == "help") {
-            std::cout
-                << "\nCommand List:\n"
-                << "connect <ws uri>\n"
-                << "close <connection id> [<close code:default=1000>] [<close reason>]\n"
-                << "show <connection id>\n"
-                << "help: Display this help text\n"
-                << "quit: Exit the program\n"
-                << std::endl;
-        } else if (input.substr(0,7) == "connect") {
-            int id = endpoint.connect(input.substr(8));
-            if (id != -1) {
-                std::cout << "> Created connection with id " << id << std::endl;
-            }
-        } else if (input.substr(0,5) == "close") {
-            std::stringstream ss(input);
-            
-            std::string cmd;
-            int id;
-            int close_code = websocketpp::close::status::normal;
-            std::string reason = "";
-            
-            ss >> cmd >> id >> close_code;
-            std::getline(ss,reason);
-            
-            endpoint.close(id, close_code, reason);
-        }  else if (input.substr(0,4) == "show") {
-            int id = atoi(input.substr(5).c_str());
-
-            connection_metadata::ptr metadata = endpoint.get_metadata(id);
-            if (metadata) {
-                std::cout << *metadata << std::endl;
-            } else {
-                std::cout << "> Unknown connection id " << id << std::endl;
-            }
-        } else {
-            std::cout << "> Unrecognized Command" << std::endl;
-        }
-    }
-
-    return 0;
-}

examples/scratch_server/SConscript

@@ -1,24 +0,0 @@
-## Scratch server example
-##
-
-Import('env')
-Import('env_cpp11')
-Import('boostlibs')
-Import('platform_libs')
-Import('polyfill_libs')
-Import('tls_libs')
-
-env = env.Clone ()
-env_cpp11 = env_cpp11.Clone ()
-
-prgs = []
-
-# if a C++11 environment is available build using that, otherwise use boost
-if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z']
-   prgs += env_cpp11.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS)
-else:
-   ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs] + ['z']
-   prgs += env.Program('scratch_server', ["scratch_server.cpp"], LIBS = ALL_LIBS)
-
-Return('prgs')

examples/scratch_server/scratch_server.cpp

@@ -1,106 +0,0 @@
-/**
- * This example is presently used as a scratch space. It may or may not be broken
- * at any given time.
- */
-
-#include <iostream>
-
-#include <websocketpp/config/debug_asio_no_tls.hpp>
-#include <websocketpp/server.hpp>
-
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
-
-struct deflate_config : public websocketpp::config::debug_core {
-    typedef deflate_config type;
-    typedef debug_core base;
-    
-    typedef base::concurrency_type concurrency_type;
-    
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-    
-    typedef base::rng_type rng_type;
-    
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
-        transport_type;
-        
-    /// permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-typedef websocketpp::server<deflate_config> server;
-
-typedef server::message_ptr message_ptr;
-
-// Define a callback to handle incoming messages
-void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
-    /*std::cout << "on_message called with hdl: " << hdl.lock().get() 
-              << " and message (" << msg->get_payload().size() << "): " << msg->get_payload()
-              << std::endl;
-    */
-    try {
-        s->send(hdl, msg->get_payload(), msg->get_opcode());
-    } catch (const websocketpp::lib::error_code& e) {
-        std::cout << "Echo failed because: " << e  
-                  << "(" << e.message() << ")" << std::endl;
-    }
-}
-
-int main(int argc, char * argv[]) {
-	// Create a server endpoint
-    server echo_server;
-	
-	try {
-        // Set logging settings        
-        if (argc > 1 && std::string(argv[1]) == "-d") {
-            echo_server.set_access_channels(websocketpp::log::alevel::all);
-            echo_server.set_error_channels(websocketpp::log::elevel::all);
-        } else {
-            echo_server.set_access_channels(websocketpp::log::alevel::none);
-            echo_server.set_error_channels(websocketpp::log::elevel::none);
-        }
-        
-        // Initialize ASIO
-        echo_server.init_asio();
-        
-        // Register our message handler
-        using websocketpp::lib::placeholders::_1;
-        using websocketpp::lib::placeholders::_2;
-        echo_server.set_message_handler(bind(&on_message,&echo_server,_1,_2));
-        
-        // Listen on port 9002
-        echo_server.listen(9002);
-        
-        // Start the server accept loop
-        echo_server.start_accept();
-	    
-	    // Start the ASIO io_service run loop
-        echo_server.run();
-    } catch (const std::exception & e) {
-        std::cout << e.what() << std::endl;
-    } catch (websocketpp::lib::error_code e) {
-        std::cout << e.message() << std::endl;
-    } catch (...) {
-        std::cout << "other exception" << std::endl;
-    }
-}

examples/simple_broadcast_server/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (simple_broadcast_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

examples/sip_client/CMakeLists.txt

@@ -9,4 +9,3 @@ build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 link_boost ()
 final_target ()
 
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

examples/sip_client/SConscript

@@ -12,7 +12,7 @@ env_cpp11 = env_cpp11.Clone ()
 
 prgs = []
 
-# if a C++11 environment is available build using that, otherwise use boost
+# if a C++11 environment is avaliable build using that, otherwise use boost
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
    ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS)

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/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (subprotocol_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

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/CMakeLists.txt

@@ -8,5 +8,3 @@ build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 
 link_boost ()
 final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

examples/telemetry_client/telemetry_client.cpp

@@ -30,20 +30,20 @@ public:
         // Bind the handlers we are using
         using websocketpp::lib::placeholders::_1;
         using websocketpp::lib::bind;
-        m_client.set_open_handler(bind(&telemetry_client::on_open,this,_1));
-        m_client.set_close_handler(bind(&telemetry_client::on_close,this,_1));
-        m_client.set_fail_handler(bind(&telemetry_client::on_fail,this,_1));
+        m_client.set_open_handler(bind(&telemetry_client::on_open,this,::_1));
+        m_client.set_close_handler(bind(&telemetry_client::on_close,this,::_1));
+        m_client.set_fail_handler(bind(&telemetry_client::on_fail,this,::_1));
     }
 
     // This method will block until the connection is complete
     void run(const std::string & uri) {
-        // Create a new connection to the given URI
+    	// 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,12 +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 ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")

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/CMakeLists.txt

@@ -2,16 +2,10 @@
 file (GLOB SOURCE_FILES *.cpp)
 file (GLOB HEADER_FILES *.hpp)
 
-if (ZLIB_FOUND)
-
 init_target (testee_client)
 
 build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
 
 link_boost ()
-link_zlib()
 final_target ()
 
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()

examples/testee_client/SConscript

@@ -14,10 +14,10 @@ prgs = []
 
 # if a C++11 environment is available build using that, otherwise use boost
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs]
    prgs += env_cpp11.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + ['z']
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
    prgs += env.Program('testee_client', ["testee_client.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/testee_client/testee_client.cpp

@@ -1,75 +1,10 @@
-/*
- * Copyright (c) 2015, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
 #include <websocketpp/config/asio_no_tls_client.hpp>
+
 #include <websocketpp/client.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
 
 #include <iostream>
 
-struct deflate_config : public websocketpp::config::asio_client {
-    typedef deflate_config type;
-    typedef asio_client base;
-    
-    typedef base::concurrency_type concurrency_type;
-    
-    typedef base::request_type request_type;
-    typedef base::response_type response_type;
-
-    typedef base::message_type message_type;
-    typedef base::con_msg_manager_type con_msg_manager_type;
-    typedef base::endpoint_msg_manager_type endpoint_msg_manager_type;
-    
-    typedef base::alog_type alog_type;
-    typedef base::elog_type elog_type;
-    
-    typedef base::rng_type rng_type;
-    
-    struct transport_config : public base::transport_config {
-        typedef type::concurrency_type concurrency_type;
-        typedef type::alog_type alog_type;
-        typedef type::elog_type elog_type;
-        typedef type::request_type request_type;
-        typedef type::response_type response_type;
-        typedef websocketpp::transport::asio::basic_socket::endpoint 
-            socket_type;
-    };
-
-    typedef websocketpp::transport::asio::endpoint<transport_config> 
-        transport_type;
-        
-    /// permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
-};
-
-typedef websocketpp::client<deflate_config> client;
+typedef websocketpp::client<websocketpp::config::asio_client> client;
 
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
@@ -93,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);
@@ -117,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;
@@ -139,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/CMakeLists.txt

@@ -1,17 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-if (ZLIB_FOUND)
-
-init_target (testee_server)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_zlib()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-
-endif()

examples/testee_server/SConscript

@@ -6,6 +6,7 @@ Import('env_cpp11')
 Import('boostlibs')
 Import('platform_libs')
 Import('polyfill_libs')
+Import('tls_libs')
 
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
@@ -14,10 +15,10 @@ prgs = []
 
 # if a C++11 environment is available build using that, otherwise use boost
 if env_cpp11.has_key('WSPP_CPP11_ENABLED'):
-   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + ['z']
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
    prgs += env_cpp11.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + ['z']
+   ALL_LIBS = boostlibs(['system'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
    prgs += env.Program('testee_server', ["testee_server.cpp"], LIBS = ALL_LIBS)
 
 Return('prgs')

examples/testee_server/testee_server.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:
@@ -25,11 +25,37 @@
  *
  */
 
-#include <websocketpp/config/asio_no_tls.hpp>
+//#include <websocketpp/config/asio_no_tls.hpp>
+#include <websocketpp/config/asio.hpp>
 #include <websocketpp/server.hpp>
-#include <websocketpp/extensions/permessage_deflate/enabled.hpp>
+
+#include <websocketpp/message_buffer/fixed.hpp>
+
 #include <iostream>
 
+typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
+
+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::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;
+}
+
 struct testee_config : public websocketpp::config::asio {
     // pull default settings from our core config
     typedef websocketpp::config::asio core;
@@ -41,6 +67,11 @@ struct testee_config : public websocketpp::config::asio {
     typedef core::con_msg_manager_type con_msg_manager_type;
     typedef core::endpoint_msg_manager_type endpoint_msg_manager_type;
 
+    //typedef websocketpp::message_buffer::fixed::policy::message message_type;
+    //typedef websocketpp::message_buffer::fixed::policy::con_msg_manager con_msg_manager_type;
+    ////typedef websocketpp::message_buffer::fixed::policy::con_msg_manager endpoint_msg_manager_type;
+    //typedef websocketpp::message_buffer::fixed::policy::endpoint_msg_manager endpoint_msg_manager_type;
+
     typedef core::alog_type alog_type;
     typedef core::elog_type elog_type;
     typedef core::rng_type rng_type;
@@ -65,12 +96,6 @@ struct testee_config : public websocketpp::config::asio {
         websocketpp::log::elevel::none;
     static const websocketpp::log::level alog_level =
         websocketpp::log::alevel::none;
-        
-    /// permessage_compress extension
-    struct permessage_deflate_config {};
-
-    typedef websocketpp::extensions::permessage_deflate::enabled
-        <permessage_deflate_config> permessage_deflate_type;
 };
 
 typedef websocketpp::server<testee_config> server;
@@ -87,13 +112,8 @@ void on_message(server* s, websocketpp::connection_hdl hdl, message_ptr msg) {
     s->send(hdl, msg->get_payload(), msg->get_opcode());
 }
 
-void on_socket_init(websocketpp::connection_hdl, boost::asio::ip::tcp::socket & s) {
-    boost::asio::ip::tcp::no_delay option(true);
-    s.set_option(option);
-}
-
 int main(int argc, char * argv[]) {
-    // Create a server endpoint
+	// Create a server endpoint
     server testee_server;
 
     short port = 9002;
@@ -104,42 +124,44 @@ int main(int argc, char * argv[]) {
         num_threads = atoi(argv[2]);
     }
 
-    try {
+	try {
         // Total silence
-        testee_server.clear_access_channels(websocketpp::log::alevel::all);
-        testee_server.clear_error_channels(websocketpp::log::alevel::all);
+        //testee_server.clear_access_channels(websocketpp::log::alevel::all);
+        //testee_server.clear_error_channels(websocketpp::log::alevel::all);
 
         // Initialize ASIO
         testee_server.init_asio();
-        testee_server.set_reuse_addr(true);
 
         // Register our message handler
         testee_server.set_message_handler(bind(&on_message,&testee_server,::_1,::_2));
-        testee_server.set_socket_init_handler(bind(&on_socket_init,::_1,::_2));
+        //testee_server.set_tls_init_handler(bind(&on_tls_init,::_1));
 
-        // Listen on specified port with extended listen backlog
-        testee_server.set_listen_backlog(8192);
+
+        // Listen on port
         testee_server.listen(port);
 
         // Start the server accept loop
         testee_server.start_accept();
 
-        // Start the ASIO io_service run loop
+	    // Start the ASIO io_service run loop
         if (num_threads == 1) {
             testee_server.run();
         } else {
             typedef websocketpp::lib::shared_ptr<websocketpp::lib::thread> thread_ptr;
             std::vector<thread_ptr> ts;
             for (size_t i = 0; i < num_threads; i++) {
-                ts.push_back(websocketpp::lib::make_shared<websocketpp::lib::thread>(&server::run, &testee_server));
+                ts.push_back(thread_ptr(new websocketpp::lib::thread(&server::run, &testee_server)));
             }
 
             for (size_t i = 0; i < num_threads; i++) {
                 ts[i]->join();
             }
         }
-
-    } 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/CMakeLists.txt

@@ -1,13 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (utility_client)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "examples")
-

examples/utility_client/SConscript

@@ -6,6 +6,7 @@ Import('env_cpp11')
 Import('boostlibs')
 Import('platform_libs')
 Import('polyfill_libs')
+Import('tls_libs')
 
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
@@ -14,10 +15,10 @@ 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]
+   ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] + [tls_libs]
    prgs += env_cpp11.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
 else:
-   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs]
+   ALL_LIBS = boostlibs(['system','random'],env) + [platform_libs] + [polyfill_libs] + [tls_libs]
    prgs += env.Program('utility_client', ["utility_client.cpp"], LIBS = ALL_LIBS)
 
-Return('prgs')
+Return('prgs')

examples/utility_client/utility_client.cpp

@@ -1,325 +1,166 @@
-/*
- * Copyright (c) 2014, Peter Thorson. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the WebSocket++ Project nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL PETER THORSON BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/**
+ * This example is presently used as a scratch space. It may or may not be broken
+ * at any given time.
  */
 
-// **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_client.hpp>
 
-#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>
+#include <chrono>
 
-typedef websocketpp::client<websocketpp::config::asio_client> client;
+typedef websocketpp::client<websocketpp::config::asio_tls_client> client;
 
-class connection_metadata {
+using websocketpp::lib::placeholders::_1;
+using websocketpp::lib::placeholders::_2;
+using websocketpp::lib::bind;
+
+// pull out the type of messages sent by our config
+typedef websocketpp::config::asio_tls_client::message_type::ptr message_ptr;
+typedef websocketpp::lib::shared_ptr<boost::asio::ssl::context> context_ptr;
+typedef client::connection_ptr connection_ptr;
+
+
+
+class perftest {
 public:
-    typedef websocketpp::lib::shared_ptr<connection_metadata> ptr;
+    typedef perftest type;
+    typedef std::chrono::duration<int,std::micro> dur_type;
 
-    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);
+    perftest () {
+        m_endpoint.set_access_channels(websocketpp::log::alevel::none);
+        m_endpoint.set_error_channels(websocketpp::log::elevel::none);
 
+        // Initialize ASIO
         m_endpoint.init_asio();
-        m_endpoint.start_perpetual();
 
-        m_thread = websocketpp::lib::make_shared<websocketpp::lib::thread>(&client::run, &m_endpoint);
+        // Register our handlers
+        m_endpoint.set_tls_init_handler(bind(&type::on_tls_init,this,::_1));
+
+        m_endpoint.set_tcp_pre_init_handler(bind(&type::on_tcp_pre_init,this,::_1));
+        m_endpoint.set_tcp_post_init_handler(bind(&type::on_tcp_post_init,this,::_1));
+        m_endpoint.set_socket_init_handler(bind(&type::on_socket_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));
     }
 
-    ~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) {
+    void start(std::string 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;
+        	m_endpoint.get_alog().write(websocketpp::log::alevel::app,ec.message());
         }
 
-        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
-        ));
+        //con->set_proxy("http://humupdates.uchicago.edu:8443");
 
         m_endpoint.connect(con);
 
-        return new_id;
+	    // Start the ASIO io_service run loop
+	    m_start = std::chrono::high_resolution_clock::now();
+        m_endpoint.run();
     }
 
-    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 on_tcp_pre_init(websocketpp::connection_hdl hdl) {
+        m_tcp_pre_init = std::chrono::high_resolution_clock::now();
+    }
+    void on_tcp_post_init(websocketpp::connection_hdl hdl) {
+        m_tcp_post_init = std::chrono::high_resolution_clock::now();
+    }
+    void on_socket_init(websocketpp::connection_hdl hdl) {
+        m_socket_init = std::chrono::high_resolution_clock::now();
     }
 
-    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;
+    context_ptr on_tls_init(websocketpp::connection_hdl hdl) {
+        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::single_dh_use);
+        } catch (std::exception& e) {
+            std::cout << e.what() << std::endl;
         }
-        
-        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);
+        return ctx;
     }
 
-    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();
+    void on_open(websocketpp::connection_hdl hdl) {
+        m_open = std::chrono::high_resolution_clock::now();
+
+        client::connection_ptr con = m_endpoint.get_con_from_hdl(hdl);
+
+        m_msg = con->get_message(websocketpp::frame::opcode::text,64);
+        m_msg->append_payload(std::string(60,'*'));
+        m_msg_count = 1;
+
+        //m_message_stamps.reserve(1000);
+
+        m_con_start = std::chrono::high_resolution_clock::now();
+
+        m_endpoint.send(hdl, m_msg);
+        //m_endpoint.send(hdl, "", websocketpp::frame::opcode::text);
+    }
+    void on_message(websocketpp::connection_hdl hdl, message_ptr msg) {
+        if (m_msg_count == 1000) {
+            m_message = std::chrono::high_resolution_clock::now();
+            m_endpoint.close(hdl,websocketpp::close::status::going_away,"");
         } else {
-            return metadata_it->second;
+            m_msg_count++;
+            m_endpoint.send(hdl, m_msg);
         }
     }
+    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;
+        std::cout << "TCP Pre Init: " << std::chrono::duration_cast<dur_type>(m_tcp_pre_init-m_start).count() << std::endl;
+        std::cout << "TCP Post Init: " << std::chrono::duration_cast<dur_type>(m_tcp_post_init-m_start).count() << std::endl;
+        std::cout << "Open: " << std::chrono::duration_cast<dur_type>(m_open-m_start).count() << std::endl;
+        std::cout << "Start: " << std::chrono::duration_cast<dur_type>(m_con_start-m_start).count() << std::endl;
+        std::cout << "Message: " << std::chrono::duration_cast<dur_type>(m_message-m_start).count() << std::endl;
+        std::cout << "Close: " << std::chrono::duration_cast<dur_type>(m_close-m_start).count() << std::endl;
+        std::cout << std::endl;
+        std::cout << "Message: " << std::chrono::duration_cast<dur_type>(m_message-m_con_start).count() << std::endl;
+        std::cout << "Close: " << std::chrono::duration_cast<dur_type>(m_close-m_message).count() << std::endl;
+    }
 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;
+    client::message_ptr m_msg;
+    size_t m_msg_count;
+
+    std::chrono::high_resolution_clock::time_point m_start;
+    std::chrono::high_resolution_clock::time_point m_tcp_pre_init;
+    std::chrono::high_resolution_clock::time_point m_tcp_post_init;
+    std::chrono::high_resolution_clock::time_point m_socket_init;
+
+    std::vector<std::chrono::high_resolution_clock::time_point> m_message_stamps;
+
+    std::chrono::high_resolution_clock::time_point m_con_start;
+    std::chrono::high_resolution_clock::time_point m_open;
+    std::chrono::high_resolution_clock::time_point m_message;
+    std::chrono::high_resolution_clock::time_point m_close;
 };
 
-int main() {
-    bool done = false;
-    std::string input;
-    websocket_endpoint endpoint;
+int main(int argc, char* argv[]) {
+	std::string uri = "wss://echo.websocket.org";
 
-    while (!done) {
-        std::cout << "Enter Command: ";
-        std::getline(std::cin, input);
+	if (argc == 2) {
+	    uri = argv[1];
+	}
 
-        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;
-        }
+	try {
+        perftest endpoint;
+        endpoint.start(uri);
+    } catch (const std::exception & e) {
+        std::cout << e.what() << std::endl;
+    } catch (websocketpp::lib::error_code e) {
+        std::cout << e.message() << std::endl;
+    } catch (...) {
+        std::cout << "other exception" << std::endl;
     }
-
-    return 0;
-}
+}

readme.md

@@ -1,12 +1,10 @@
-WebSocket++ (0.7.x-dev)
+WebSocket++ (0.3.0-alpha4)
 ==========================
 
 WebSocket++ is a header only C++ library that implements RFC6455 The WebSocket
 Protocol. It allows integrating WebSocket client and server functionality into
 C++ programs. It uses interchangeable network transport modules including one
-based on raw char buffers, one based on C++ iostreams, and one based on Asio 
-(either via Boost or standalone). End users can write additional transport
-policies to support other networking or event libraries as needed.
+based on C++ iostreams and one based on Boost Asio.
 
 Major Features
 ==============
@@ -15,7 +13,7 @@ Major Features
 * Message/event based interface
 * Supports secure WebSockets (TLS), IPv6, and explicit proxies.
 * Flexible dependency management (C++11 Standard Library or Boost)
-* Interchangeable network transport modules (raw, iostream, Asio, or custom)
+* Interchangeable network transport modules (iostream and Boost Asio)
 * Portable/cross platform (Posix/Windows, 32/64bit, Intel/ARM/PPC)
 * Thread-safe
 
@@ -33,8 +31,6 @@ http://www.zaphoyd.com/websocketpp/manual/
 **GitHub Repository**
 https://github.com/zaphoyd/websocketpp/
 
-GitHub pull requests should be submitted to the `develop` branch.
-
 **Announcements Mailing List**
 http://groups.google.com/group/websocketpp-announcements/
 

roadmap.md

@@ -16,23 +16,24 @@ Complete & Tested:
 - open_handler
 - close_handler
 - echo_server & echo_server_tls
-- External io_service support
+
+Implimented, 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/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (test_connection)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

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,17 @@ 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) {}
+    connection_setup(bool server)
+      : c(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,38 +113,6 @@ void http_func(server* s, websocketpp::connection_hdl hdl) {
     con->set_status(websocketpp::http::status_code::ok);
 }
 
-void defer_http_func(server* s, bool * deferred, websocketpp::connection_hdl hdl) {
-    *deferred = true;
-    
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-    
-    websocketpp::lib::error_code ec = con->defer_http_response();
-    BOOST_CHECK_EQUAL(ec, websocketpp::lib::error_code());
-}
-
-void check_on_fail(server* s, websocketpp::lib::error_code ec, bool & called, 
-    websocketpp::connection_hdl hdl)
-{
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    BOOST_CHECK_EQUAL(ec, con->get_ec());
-    called = true;
-}
-
-void on_open_print(server* s, websocketpp::connection_hdl hdl)
-{
-    server::connection_ptr con = s->get_con_from_hdl(hdl);
-
-    std::cout << con->get_uri() << std::endl;
-}
-
-void fail_on_open(websocketpp::connection_hdl) {
-    BOOST_CHECK(false);
-}
-void fail_on_http(websocketpp::connection_hdl) {
-    BOOST_CHECK(false);
-}
-
 BOOST_AUTO_TEST_CASE( connection_extensions ) {
     connection_setup env(true);
 
@@ -214,8 +128,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);
 }
@@ -226,57 +140,19 @@ 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);
 }
 
-BOOST_AUTO_TEST_CASE( deferred_http_request ) {
-    std::string input = "GET /foo/bar HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
-    std::string output = "HTTP/1.1 200 OK\r\nContent-Length: 8\r\nServer: ";
-    output+=websocketpp::user_agent;
-    output+="\r\n\r\n/foo/bar";
-
-    server s;
-    server::connection_ptr con;
-    bool deferred = false;
-    s.set_http_handler(bind(&defer_http_func,&s, &deferred,::_1));
-
-    s.clear_access_channels(websocketpp::log::alevel::all);
-    s.clear_error_channels(websocketpp::log::elevel::all);
-    
-    std::stringstream ostream;
-    s.register_ostream(&ostream);
-
-    con = s.get_connection();
-    con->start();
-    
-    BOOST_CHECK(!deferred);
-    BOOST_CHECK_EQUAL(ostream.str(), "");
-    con->read_some(input.data(),input.size());
-    BOOST_CHECK(deferred);
-    BOOST_CHECK_EQUAL(ostream.str(), "");
-
-    con->set_body(con->get_resource());
-    con->set_status(websocketpp::http::status_code::ok);
-    
-    websocketpp::lib::error_code ec;
-    s.send_http_response(con->get_handle(),ec);
-    BOOST_CHECK_EQUAL(ec, websocketpp::lib::error_code());
-    BOOST_CHECK_EQUAL(ostream.str(), output);
-    con->send_http_response(ec);
-    BOOST_CHECK_EQUAL(ec, make_error_code(websocketpp::error::invalid_state));
-    
-}
-
 BOOST_AUTO_TEST_CASE( request_no_server_header ) {
     std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
     std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nUpgrade: websocket\r\n\r\n";
 
-    server s;
-    s.set_user_agent("");
-    s.set_message_handler(bind(&echo_func,&s,::_1,::_2));
+	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);
 }
@@ -285,10 +161,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);
 }
@@ -298,126 +174,25 @@ 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());
 }
 
-BOOST_AUTO_TEST_CASE( set_max_message_size ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\n\r\n";
-    
-    // After the handshake, add a single frame with a message that is too long.
-    char frame0[10] = {char(0x82), char(0x83), 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01};
-    input.append(frame0, 10);
-    
-    std::string output = "HTTP/1.1 101 Switching Protocols\r\nConnection: upgrade\r\nSec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=\r\nServer: foo\r\nUpgrade: websocket\r\n\r\n";
-
-    // After the handshake, add a single frame with a close message with message too big
-    // error code.
-    char frame1[4] = {char(0x88), 0x19, 0x03, char(0xf1)};
-    output.append(frame1, 4);
-    output.append("A message was too large");
-
-    server s;
-    s.set_user_agent("");
-    s.set_validate_handler(bind(&validate_set_ua,&s,::_1));
-    s.set_max_message_size(2);
-
-    BOOST_CHECK_EQUAL(run_server_test(s,input), output);
-}
-
-BOOST_AUTO_TEST_CASE( websocket_fail_parse_error ) {
-    std::string input = "asdf\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::http_parse_error);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-
-    run_server_test(s,input,false);
-    BOOST_CHECK(called);
-}
-
-BOOST_AUTO_TEST_CASE( websocket_fail_invalid_version ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: foo\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::invalid_version);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-
-    run_server_test(s,input,false);
-    BOOST_CHECK(called);
-}
-
-BOOST_AUTO_TEST_CASE( websocket_fail_unsupported_version ) {
-    std::string input = "GET / HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 12\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-
-    run_server_test(s,input,false);
-    BOOST_CHECK(called);
-}
-
-/*BOOST_AUTO_TEST_CASE( websocket_fail_invalid_uri ) {
-    std::string input = "GET http://345.123.123.123/foo HTTP/1.1\r\nHost: www.example.com\r\nConnection: upgrade\r\nUpgrade: websocket\r\nSec-WebSocket-Version: 13\r\nSec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-    s.set_open_handler(bind(&on_open_print,&s,::_1));
-
-    std::cout << run_server_test(s,input,true) << std::endl;
-    BOOST_CHECK(called);
-}
-
-BOOST_AUTO_TEST_CASE( websocket_fail_invalid_uri_http ) {
-    std::string input = "GET http://345.123.123.123/foo HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::unsupported_version);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-    s.set_open_handler(bind(&on_open_print,&s,::_1));
-
-    std::cout << run_server_test(s,input,true) << std::endl;
-    BOOST_CHECK(called);
-}*/
-
-BOOST_AUTO_TEST_CASE( websocket_fail_upgrade_required ) {
-    std::string input = "GET /foo/bar HTTP/1.1\r\nHost: www.example.com\r\nOrigin: http://www.example.com\r\n\r\n";
-
-    server s;
-    websocketpp::lib::error_code ec = make_error_code(websocketpp::error::upgrade_required);
-    bool called = false;
-    s.set_fail_handler(bind(&check_on_fail,&s,ec,websocketpp::lib::ref(called),::_1));
-
-    run_server_test(s,input,false);
-    BOOST_CHECK(called);
-}
-
-// TODO: set max message size in client endpoint test case
-// TODO: set max message size mid connection test case
-// TODO: [maybe] set max message size in open handler
-
 /*
 
 BOOST_AUTO_TEST_CASE( user_reject_origin ) {
@@ -430,96 +205,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/CMakeLists.txt

@@ -1,17 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-if (OPENSSL_FOUND)
-
-init_target (test_endpoint)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-link_openssl ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-endif()

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:
@@ -57,35 +57,6 @@ BOOST_AUTO_TEST_CASE( initialize_server_asio_external ) {
     s.init_asio(&ios);
 }
 
-#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-BOOST_AUTO_TEST_CASE( move_construct_server_core ) {
-    websocketpp::server<websocketpp::config::core> s1;
-    
-    websocketpp::server<websocketpp::config::core> s2(std::move(s1));
-}
-
-/*
-// temporary disable because library doesn't pass
-BOOST_AUTO_TEST_CASE( emplace ) {
-    std::stringstream out1;
-    std::stringstream out2;
-    
-    std::vector<websocketpp::server<websocketpp::config::asio_tls>> v;
-    
-    v.emplace_back();
-    v.emplace_back();
-    
-    v[0].get_alog().set_ostream(&out1);
-    v[0].get_alog().set_ostream(&out2);
-    
-    v[0].get_alog().write(websocketpp::log::alevel::app,"devel0");
-    v[1].get_alog().write(websocketpp::log::alevel::app,"devel1");
-    BOOST_CHECK( out1.str().size() > 0 );
-    BOOST_CHECK( out2.str().size() > 0 );
-}*/
-
-#endif // _WEBSOCKETPP_MOVE_SEMANTICS_
-
 struct endpoint_extension {
     endpoint_extension() : extension_value(5) {}
 
@@ -123,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/extension/CMakeLists.txt

@@ -1,22 +0,0 @@
-# Extension Tests
-file (GLOB SOURCE extension.cpp)
-
-init_target (test_extension)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-if ( ZLIB_FOUND )
-
-# Permessage-deflate tests
-file (GLOB SOURCE permessage_deflate.cpp)
-
-init_target (test_permessage_deflate)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_zlib()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-endif ( ZLIB_FOUND )

test/extension/permessage_deflate.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 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:
@@ -100,10 +100,10 @@ BOOST_AUTO_TEST_CASE( negotiation_invalid_attr ) {
     BOOST_CHECK_EQUAL( v.esp.second, "");
 }
 
-// Negotiate server_no_context_takeover
-BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover_invalid ) {
+// Negotiate s2c_no_context_takeover
+BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover_invalid ) {
     ext_vars v;
-    v.attr["server_no_context_takeover"] = "foo";
+    v.attr["s2c_no_context_takeover"] = "foo";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( !v.exts.is_enabled() );
@@ -111,30 +111,30 @@ BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover_invalid ) {
     BOOST_CHECK_EQUAL( v.esp.second, "");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover ) {
+BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover ) {
     ext_vars v;
-    v.attr["server_no_context_takeover"] = "";
+    v.attr["s2c_no_context_takeover"] = "";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_server_no_context_takeover_server_initiated ) {
+BOOST_AUTO_TEST_CASE( negotiate_s2c_no_context_takeover_server_initiated ) {
     ext_vars v;
 
-    v.exts.enable_server_no_context_takeover();
+    v.exts.enable_s2c_no_context_takeover();
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover");
 }
 
-// Negotiate client_no_context_takeover
-BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover_invalid ) {
+// Negotiate c2s_no_context_takeover
+BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover_invalid ) {
     ext_vars v;
-    v.attr["client_no_context_takeover"] = "foo";
+    v.attr["c2s_no_context_takeover"] = "foo";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( !v.exts.is_enabled() );
@@ -142,29 +142,29 @@ BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover_invalid ) {
     BOOST_CHECK_EQUAL( v.esp.second, "");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover ) {
+BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover ) {
     ext_vars v;
-    v.attr["client_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_client_no_context_takeover_server_initiated ) {
+BOOST_AUTO_TEST_CASE( negotiate_c2s_no_context_takeover_server_initiated ) {
     ext_vars v;
 
-    v.exts.enable_client_no_context_takeover();
+    v.exts.enable_c2s_no_context_takeover();
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover");
 }
 
 
-// Negotiate server_max_window_bits
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) {
+// Negotiate s2c_max_window_bits
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_invalid ) {
     ext_vars v;
 
     std::vector<std::string> values;
@@ -175,7 +175,7 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) {
 
     std::vector<std::string>::const_iterator it;
     for (it = values.begin(); it != values.end(); ++it) {
-        v.attr["server_max_window_bits"] = *it;
+        v.attr["s2c_max_window_bits"] = *it;
 
         v.esp = v.exts.negotiate(v.attr);
         BOOST_CHECK( !v.exts.is_enabled() );
@@ -184,16 +184,16 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_invalid ) {
     }
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_valid ) {
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_valid ) {
     ext_vars v;
-    v.attr["server_max_window_bits"] = "8";
+    v.attr["s2c_max_window_bits"] = "8";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
 
-    v.attr["server_max_window_bits"] = "15";
+    v.attr["s2c_max_window_bits"] = "15";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
@@ -201,21 +201,21 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_valid ) {
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
 }
 
-BOOST_AUTO_TEST_CASE( invalid_set_server_max_window_bits ) {
+BOOST_AUTO_TEST_CASE( invalid_set_s2c_max_window_bits ) {
     ext_vars v;
 
-    v.ec = v.exts.set_server_max_window_bits(7,pmd_mode::decline);
+    v.ec = v.exts.set_s2c_max_window_bits(7,pmd_mode::decline);
     BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
 
-    v.ec = v.exts.set_server_max_window_bits(16,pmd_mode::decline);
+    v.ec = v.exts.set_s2c_max_window_bits(16,pmd_mode::decline);
     BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) {
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_decline ) {
     ext_vars v;
-    v.attr["server_max_window_bits"] = "8";
+    v.attr["s2c_max_window_bits"] = "8";
 
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::decline);
+    v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::decline);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
@@ -223,44 +223,44 @@ BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_decline ) {
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_accept ) {
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_accept ) {
     ext_vars v;
-    v.attr["server_max_window_bits"] = "8";
+    v.attr["s2c_max_window_bits"] = "8";
 
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::accept);
+    v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::accept);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_largest ) {
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_largest ) {
     ext_vars v;
-    v.attr["server_max_window_bits"] = "8";
+    v.attr["s2c_max_window_bits"] = "8";
 
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::largest);
+    v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::largest);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_server_max_window_bits_smallest ) {
+BOOST_AUTO_TEST_CASE( negotiate_s2c_max_window_bits_smallest ) {
     ext_vars v;
-    v.attr["server_max_window_bits"] = "8";
+    v.attr["s2c_max_window_bits"] = "8";
 
-    v.ec = v.exts.set_server_max_window_bits(15,pmd_mode::smallest);
+    v.ec = v.exts.set_s2c_max_window_bits(15,pmd_mode::smallest);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=8");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=8");
 }
 
-// Negotiate server_max_window_bits
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_invalid ) {
+// Negotiate s2c_max_window_bits
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_invalid ) {
     ext_vars v;
 
     std::vector<std::string> values;
@@ -270,7 +270,7 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_invalid ) {
 
     std::vector<std::string>::const_iterator it;
     for (it = values.begin(); it != values.end(); ++it) {
-        v.attr["client_max_window_bits"] = *it;
+        v.attr["c2s_max_window_bits"] = *it;
 
         v.esp = v.exts.negotiate(v.attr);
         BOOST_CHECK( !v.exts.is_enabled() );
@@ -279,43 +279,43 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_invalid ) {
     }
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_valid ) {
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_valid ) {
     ext_vars v;
 
-    v.attr["client_max_window_bits"] = "";
+    v.attr["c2s_max_window_bits"] = "";
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
 
-    v.attr["client_max_window_bits"] = "8";
+    v.attr["c2s_max_window_bits"] = "8";
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
 
-    v.attr["client_max_window_bits"] = "15";
+    v.attr["c2s_max_window_bits"] = "15";
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
 }
 
-BOOST_AUTO_TEST_CASE( invalid_set_client_max_window_bits ) {
+BOOST_AUTO_TEST_CASE( invalid_set_c2s_max_window_bits ) {
     ext_vars v;
 
-    v.ec = v.exts.set_client_max_window_bits(7,pmd_mode::decline);
+    v.ec = v.exts.set_c2s_max_window_bits(7,pmd_mode::decline);
     BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
 
-    v.ec = v.exts.set_client_max_window_bits(16,pmd_mode::decline);
+    v.ec = v.exts.set_c2s_max_window_bits(16,pmd_mode::decline);
     BOOST_CHECK_EQUAL(v.ec,pmde::make_error_code(pmde::invalid_max_window_bits));
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) {
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_decline ) {
     ext_vars v;
-    v.attr["client_max_window_bits"] = "8";
+    v.attr["c2s_max_window_bits"] = "8";
 
-    v.ec = v.exts.set_client_max_window_bits(8,pmd_mode::decline);
+    v.ec = v.exts.set_c2s_max_window_bits(8,pmd_mode::decline);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
@@ -323,40 +323,40 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_decline ) {
     BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_accept ) {
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_accept ) {
     ext_vars v;
-    v.attr["client_max_window_bits"] = "8";
+    v.attr["c2s_max_window_bits"] = "8";
 
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::accept);
+    v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::accept);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_largest ) {
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_largest ) {
     ext_vars v;
-    v.attr["client_max_window_bits"] = "8";
+    v.attr["c2s_max_window_bits"] = "8";
 
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::largest);
+    v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::largest);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
 }
 
-BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) {
+BOOST_AUTO_TEST_CASE( negotiate_c2s_max_window_bits_smallest ) {
     ext_vars v;
-    v.attr["client_max_window_bits"] = "8";
+    v.attr["c2s_max_window_bits"] = "8";
 
-    v.ec = v.exts.set_client_max_window_bits(15,pmd_mode::smallest);
+    v.ec = v.exts.set_c2s_max_window_bits(15,pmd_mode::smallest);
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_max_window_bits=8");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_max_window_bits=8");
 }
 
 
@@ -364,286 +364,180 @@ BOOST_AUTO_TEST_CASE( negotiate_client_max_window_bits_smallest ) {
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated1 ) {
     ext_vars v;
 
-    v.attr["server_no_context_takeover"] = "";
-    v.attr["client_no_context_takeover"] = "";
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated2 ) {
     ext_vars v;
 
-    v.attr["server_no_context_takeover"] = "";
-    v.attr["server_max_window_bits"] = "10";
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; server_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; s2c_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated3 ) {
     ext_vars v;
 
-    v.attr["server_no_context_takeover"] = "";
-    v.attr["client_max_window_bits"] = "10";
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated4 ) {
     ext_vars v;
 
-    v.attr["client_no_context_takeover"] = "";
-    v.attr["server_max_window_bits"] = "10";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; server_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; s2c_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated5 ) {
     ext_vars v;
 
-    v.attr["client_no_context_takeover"] = "";
-    v.attr["client_max_window_bits"] = "10";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["c2s_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; client_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; c2s_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_two_client_initiated6 ) {
     ext_vars v;
 
-    v.attr["server_max_window_bits"] = "10";
-    v.attr["client_max_window_bits"] = "10";
+    v.attr["s2c_max_window_bits"] = "10";
+    v.attr["c2s_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_max_window_bits=10; client_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_max_window_bits=10; c2s_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated1 ) {
     ext_vars v;
 
-    v.attr["server_no_context_takeover"] = "";
-    v.attr["client_no_context_takeover"] = "";
-    v.attr["server_max_window_bits"] = "10";
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; server_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; s2c_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated2 ) {
     ext_vars v;
 
-    v.attr["server_no_context_takeover"] = "";
-    v.attr["client_no_context_takeover"] = "";
-    v.attr["client_max_window_bits"] = "10";
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["c2s_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; client_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; c2s_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated3 ) {
     ext_vars v;
 
-    v.attr["server_no_context_takeover"] = "";
-    v.attr["server_max_window_bits"] = "10";
-    v.attr["client_max_window_bits"] = "10";
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+    v.attr["c2s_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_three_client_initiated4 ) {
     ext_vars v;
 
-    v.attr["client_no_context_takeover"] = "";
-    v.attr["server_max_window_bits"] = "10";
-    v.attr["client_max_window_bits"] = "10";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+    v.attr["c2s_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; client_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; c2s_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
 }
 
 BOOST_AUTO_TEST_CASE( negotiate_four_client_initiated ) {
     ext_vars v;
 
-    v.attr["server_no_context_takeover"] = "";
-    v.attr["client_no_context_takeover"] = "";
-    v.attr["server_max_window_bits"] = "10";
-    v.attr["client_max_window_bits"] = "10";
+    v.attr["s2c_no_context_takeover"] = "";
+    v.attr["c2s_no_context_takeover"] = "";
+    v.attr["s2c_max_window_bits"] = "10";
+    v.attr["c2s_max_window_bits"] = "10";
 
     v.esp = v.exts.negotiate(v.attr);
     BOOST_CHECK( v.exts.is_enabled() );
     BOOST_CHECK_EQUAL( v.esp.first, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; server_no_context_takeover; client_no_context_takeover; server_max_window_bits=10; client_max_window_bits=10");
+    BOOST_CHECK_EQUAL( v.esp.second, "permessage-deflate; s2c_no_context_takeover; c2s_no_context_takeover; s2c_max_window_bits=10; c2s_max_window_bits=10");
 }
 
 // Compression
+/*
 BOOST_AUTO_TEST_CASE( compress_data ) {
     ext_vars v;
 
-    std::string compress_in = "Hello";
-    std::string compress_out;
-    std::string decompress_out;
+    std::string in = "Hello";
+    std::string out;
+    std::string in2;
+    std::string out2;
 
-    v.exts.init(true);
+    v.exts.init();
 
-    v.ec = v.exts.compress(compress_in,compress_out);
+    v.ec = v.exts.compress(in,out);
+
+    std::cout << "in : " << websocketpp::utility::to_hex(in) << std::endl;
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
+    std::cout << "out: " << websocketpp::utility::to_hex(out) << std::endl;
+
+    in2 = out;
+
+    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(in2.data()),in2.size(),out2);
 
-    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
+    std::cout << "out: " << websocketpp::utility::to_hex(out2) << std::endl;
+    BOOST_CHECK_EQUAL( out, out2 );
 }
 
-BOOST_AUTO_TEST_CASE( compress_data_multiple ) {
-    ext_vars v;
-
-    v.exts.init(true);
-
-    for (int i = 0; i < 2; i++) {
-        std::string compress_in = "Hello";
-        std::string compress_out;
-        std::string decompress_out;
-
-        v.ec = v.exts.compress(compress_in,compress_out);
-        BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-        v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-        BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-        BOOST_CHECK_EQUAL( compress_in, decompress_out );
-    }
-}
-
-BOOST_AUTO_TEST_CASE( compress_data_large ) {
-    ext_vars v;
-
-    std::string compress_in(600,'*');
-    std::string compress_out;
-    std::string decompress_out;
-
-    websocketpp::http::attribute_list alist;
-
-    alist["server_max_window_bits"] = "8";
-    v.exts.set_server_max_window_bits(8,websocketpp::extensions::permessage_deflate::mode::smallest);
-
-    v.exts.negotiate(alist);
-    v.exts.init(true);
-
-    v.ec = v.exts.compress(compress_in,compress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-}
-
-BOOST_AUTO_TEST_CASE( compress_data_no_context_takeover ) {
-    ext_vars v;
-
-    std::string compress_in = "Hello";
-    std::string compress_out1;
-    std::string compress_out2;
-    std::string decompress_out;
-
-    websocketpp::http::attribute_list alist;
-
-    alist["server_no_context_takeover"] = "";
-    v.exts.enable_server_no_context_takeover();
-
-    v.exts.negotiate(alist);
-    v.exts.init(true);
-
-    v.ec = v.exts.compress(compress_in,compress_out1);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(
-        reinterpret_cast<const uint8_t *>(compress_out1.data()),
-        compress_out1.size(),
-        decompress_out
-    );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-
-    decompress_out = "";
-
-    v.ec = v.exts.compress(compress_in,compress_out2);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(
-        reinterpret_cast<const uint8_t *>(compress_out2.data()),
-        compress_out2.size(),
-        decompress_out
-    );
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-
-    BOOST_CHECK_EQUAL( compress_out1, compress_out2 );
-}
-
-BOOST_AUTO_TEST_CASE( compress_empty ) {
-    ext_vars v;
-
-    std::string compress_in = "";
-    std::string compress_out;
-    std::string decompress_out;
-
-    v.exts.init(true);
-
-    v.ec = v.exts.compress(compress_in,compress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-
-    compress_out = "";
-    decompress_out = "";
-
-    v.ec = v.exts.compress(compress_in,compress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-
-    v.ec = v.exts.decompress(reinterpret_cast<const uint8_t *>(compress_out.data()),compress_out.size(),decompress_out);
-    BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( compress_in, decompress_out );
-}
-
-/// @todo: more compression tests
-/**
- * - compress at different compression levels
- */
-
-// Decompression
 BOOST_AUTO_TEST_CASE( decompress_data ) {
     ext_vars v;
 
-    uint8_t in[11] = {0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00, 0x00, 0x00, 0xff, 0xff};
-    std::string out = "";
-    std::string reference = "Hello";
+    uint8_t in[12] = {0xf2, 0x48, 0xcd, 0xc9, 0xc9, 0x07, 0x00, 0x00, 0x00, 0xff, 0xff};
+    std::string out;
 
-    v.exts.init(true);
+    v.exts.init();
 
-    v.ec = v.exts.decompress(in,11,out);
+    v.ec = v.exts.decompress(in,12,out);
 
     BOOST_CHECK_EQUAL( v.ec, websocketpp::lib::error_code() );
-    BOOST_CHECK_EQUAL( out, reference );
+    std::cout << "out: " << websocketpp::utility::to_hex(out) << std::endl;
+    BOOST_CHECK( false );
 }
+*/

test/http/CMakeLists.txt

@@ -1,11 +0,0 @@
-
-file (GLOB SOURCE_FILES parser.cpp)
-
-init_target (test_http)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

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
@@ -356,28 +355,6 @@ BOOST_AUTO_TEST_CASE( extract_parameters ) {
     BOOST_CHECK_EQUAL( a.find("bar")->second, "a \"b\" c" );
 }
 
-BOOST_AUTO_TEST_CASE( strip_lws ) {
-    std::string test1 = "foo";
-    std::string test2 = " foo ";
-    std::string test3 = "foo ";
-    std::string test4 = " foo";
-    std::string test5 = "    foo     ";
-    std::string test6 = "  \r\n  foo     ";
-    std::string test7 = "  \t  foo     ";
-    std::string test8 = "  \t       ";
-    std::string test9 = " \n\r";
-
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test1), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test2), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test3), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test4), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test5), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test6), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test7), "foo" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test8), "" );
-    BOOST_CHECK_EQUAL( websocketpp::http::parser::strip_lws(test9), "" );
-}
-
 BOOST_AUTO_TEST_CASE( case_insensitive_headers ) {
     websocketpp::http::parser::parser r;
 
@@ -415,9 +392,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 );
@@ -432,9 +409,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 );
@@ -449,9 +426,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 );
@@ -467,10 +444,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 );
@@ -482,62 +459,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;
 
@@ -547,33 +468,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;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK( pos == 41 );
-    BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
-    BOOST_CHECK( r.get_method() == "GET" );
-    BOOST_CHECK( r.get_uri() == "/" );
-    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
-}
-
-BOOST_AUTO_TEST_CASE( trailing_body_characters_beyond_max_lenth ) {
-    websocketpp::http::parser::request r;
-
-    std::string raw = "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n";
-    raw.append(websocketpp::http::max_header_size,'*');
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos = r.consume(raw.c_str(),raw.size());
-    } catch (...) {
-        exception = true;
+    	exception = true;
     }
 
     BOOST_CHECK( exception == false );
@@ -595,11 +492,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 );
@@ -621,11 +518,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 );
@@ -640,18 +537,17 @@ BOOST_AUTO_TEST_CASE( basic_split2 ) {
 BOOST_AUTO_TEST_CASE( max_header_len ) {
     websocketpp::http::parser::request r;
 
-    std::string raw(websocketpp::http::max_header_size-1,'*');
-    raw += "\r\n";
+    std::string raw(websocketpp::http::max_header_size+1,'*');
 
     bool exception = false;
     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 );
@@ -667,38 +563,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;
 
@@ -708,9 +583,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 );
@@ -741,9 +616,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 );
@@ -757,9 +632,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 );
@@ -774,18 +649,18 @@ 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 );
-    BOOST_CHECK_EQUAL( pos, 41 );
+    BOOST_CHECK( pos == 41 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.0" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+    BOOST_CHECK( r.get_version() == "HTTP/1.0" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
 }
 
 BOOST_AUTO_TEST_CASE( new_http_version1 ) {
@@ -797,18 +672,18 @@ 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 );
-    BOOST_CHECK_EQUAL( pos, 42 );
+    BOOST_CHECK( pos == 42 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.12" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+    BOOST_CHECK( r.get_version() == "HTTP/1.12" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
 }
 
 BOOST_AUTO_TEST_CASE( new_http_version2 ) {
@@ -820,18 +695,18 @@ 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 );
-    BOOST_CHECK_EQUAL( pos, 43 );
+    BOOST_CHECK( pos == 43 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/12.12" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+    BOOST_CHECK( r.get_version() == "HTTP/12.12" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
 }
 
 /* commented out due to not being implemented yet
@@ -845,13 +720,13 @@ 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 );
-}*/
+}
 
 BOOST_AUTO_TEST_CASE( header_whitespace1 ) {
     websocketpp::http::parser::request r;
@@ -862,18 +737,18 @@ 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 );
-    BOOST_CHECK_EQUAL( pos, 43 );
+    BOOST_CHECK( pos == 43 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
 }
 
 BOOST_AUTO_TEST_CASE( header_whitespace2 ) {
@@ -885,19 +760,19 @@ 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 );
-    BOOST_CHECK_EQUAL( pos, 40 );
+    BOOST_CHECK( pos == 40 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Host"), "www.example.com" );
-}
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Host") == "www.example.com" );
+}*/
 
 BOOST_AUTO_TEST_CASE( header_aggregation ) {
     websocketpp::http::parser::request r;
@@ -908,18 +783,18 @@ 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 );
-    BOOST_CHECK_EQUAL( pos, 61 );
+    BOOST_CHECK( pos == 61 );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_method(), "GET" );
-    BOOST_CHECK_EQUAL( r.get_uri(), "/" );
-    BOOST_CHECK_EQUAL( r.get_header("Foo"), "bar, bat" );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_method() == "GET" );
+    BOOST_CHECK( r.get_uri() == "/" );
+    BOOST_CHECK( r.get_header("Foo") == "bar, bat" );
 }
 
 BOOST_AUTO_TEST_CASE( wikipedia_example_response ) {
@@ -931,105 +806,22 @@ 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 );
-    BOOST_CHECK_EQUAL( pos, 159 );
+    BOOST_CHECK( pos == 159 );
     BOOST_CHECK( r.headers_ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
-}
-
-BOOST_AUTO_TEST_CASE( wikipedia_example_response_trailing ) {
-    websocketpp::http::parser::response r;
-
-    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-    raw += "a";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 159 );
-    BOOST_CHECK( r.headers_ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
-}
-
-BOOST_AUTO_TEST_CASE( wikipedia_example_response_trailing_large ) {
-    websocketpp::http::parser::response r;
-
-    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept: HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-    raw.append(websocketpp::http::max_header_size,'*');
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 159 );
-    BOOST_CHECK( r.headers_ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
-}
-
-BOOST_AUTO_TEST_CASE( response_with_non_standard_lws ) {
-    websocketpp::http::parser::response r;
-
-    std::string raw = "HTTP/1.1 101 Switching Protocols\r\nUpgrade: websocket\r\nConnection: Upgrade\r\nSec-WebSocket-Accept:HSmrc0sMlYUkAGmm5OPpG2HaGWk=\r\nSec-WebSocket-Protocol: chat\r\n\r\n";
-
-    bool exception = false;
-    size_t pos = 0;
-
-    try {
-        pos += r.consume(raw.c_str(),raw.size());
-    } catch (std::exception &e) {
-        exception = true;
-        std::cout << e.what() << std::endl;
-    }
-
-    BOOST_CHECK( exception == false );
-    BOOST_CHECK_EQUAL( pos, 158 );
-    BOOST_CHECK( r.headers_ready() );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::switching_protocols );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "Switching Protocols" );
-    BOOST_CHECK_EQUAL( r.get_header("Upgrade"), "websocket" );
-    BOOST_CHECK_EQUAL( r.get_header("Connection"), "Upgrade" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Accept"), "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
-    BOOST_CHECK_EQUAL( r.get_header("Sec-WebSocket-Protocol"), "chat" );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_status_code() == websocketpp::http::status_code::switching_protocols );
+    BOOST_CHECK( r.get_status_msg() == "Switching Protocols" );
+    BOOST_CHECK( r.get_header("Upgrade") == "websocket" );
+    BOOST_CHECK( r.get_header("Connection") == "Upgrade" );
+    BOOST_CHECK( r.get_header("Sec-WebSocket-Accept") == "HSmrc0sMlYUkAGmm5OPpG2HaGWk=" );
+    BOOST_CHECK( r.get_header("Sec-WebSocket-Protocol") == "chat" );
 }
 
 BOOST_AUTO_TEST_CASE( plain_http_response ) {
@@ -1041,28 +833,28 @@ 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 );
-    BOOST_CHECK_EQUAL( pos, 405 );
+    BOOST_CHECK( pos == 405 );
     BOOST_CHECK( r.headers_ready() == true );
     BOOST_CHECK( r.ready() == true );
-    BOOST_CHECK_EQUAL( r.get_version(), "HTTP/1.1" );
-    BOOST_CHECK_EQUAL( r.get_status_code(), websocketpp::http::status_code::ok );
-    BOOST_CHECK_EQUAL( r.get_status_msg(), "OK" );
-    BOOST_CHECK_EQUAL( r.get_header("Date"), "Thu, 10 May 2012 11:59:25 GMT" );
-    BOOST_CHECK_EQUAL( r.get_header("Server"), "Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch" );
-    BOOST_CHECK_EQUAL( r.get_header("Last-Modified"), "Tue, 30 Mar 2010 17:41:28 GMT" );
-    BOOST_CHECK_EQUAL( r.get_header("ETag"), "\"16799d-55-4830823a78200\"" );
-    BOOST_CHECK_EQUAL( r.get_header("Accept-Ranges"), "bytes" );
-    BOOST_CHECK_EQUAL( r.get_header("Content-Length"), "85" );
-    BOOST_CHECK_EQUAL( r.get_header("Vary"), "Accept-Encoding" );
-    BOOST_CHECK_EQUAL( r.get_header("Content-Type"), "text/html" );
-    BOOST_CHECK_EQUAL( r.get_body(), "<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>" );
+    BOOST_CHECK( r.get_version() == "HTTP/1.1" );
+    BOOST_CHECK( r.get_status_code() == websocketpp::http::status_code::ok );
+    BOOST_CHECK( r.get_status_msg() == "OK" );
+    BOOST_CHECK( r.get_header("Date") == "Thu, 10 May 2012 11:59:25 GMT" );
+    BOOST_CHECK( r.get_header("Server") == "Apache/2.2.21 (Unix) mod_ssl/2.2.21 OpenSSL/0.9.8r DAV/2 PHP/5.3.8 with Suhosin-Patch" );
+    BOOST_CHECK( r.get_header("Last-Modified") == "Tue, 30 Mar 2010 17:41:28 GMT" );
+    BOOST_CHECK( r.get_header("ETag") == "\"16799d-55-4830823a78200\"" );
+    BOOST_CHECK( r.get_header("Accept-Ranges") == "bytes" );
+    BOOST_CHECK( r.get_header("Content-Length") == "85" );
+    BOOST_CHECK( r.get_header("Vary") == "Accept-Encoding" );
+    BOOST_CHECK( r.get_header("Content-Type") == "text/html" );
+    BOOST_CHECK( r.get_body() == "<!doctype html>\n<html>\n<head>\n<title>Thor</title>\n</head>\n<body> \n<p>Thor</p>\n</body>" );
 }
 
 BOOST_AUTO_TEST_CASE( parse_istream ) {
@@ -1076,10 +868,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 );
@@ -1097,7 +889,7 @@ BOOST_AUTO_TEST_CASE( write_request_basic ) {
     r.set_method("GET");
     r.set_uri("/");
 
-    BOOST_CHECK_EQUAL( r.raw(), raw );
+    BOOST_CHECK( r.raw() == raw );
 }
 
 BOOST_AUTO_TEST_CASE( write_request_with_header ) {
@@ -1110,7 +902,7 @@ BOOST_AUTO_TEST_CASE( write_request_with_header ) {
     r.set_uri("/");
     r.replace_header("Host","http://example.com");
 
-    BOOST_CHECK_EQUAL( r.raw(), raw );
+    BOOST_CHECK( r.raw() == raw );
 }
 
 BOOST_AUTO_TEST_CASE( write_request_with_body ) {
@@ -1125,5 +917,5 @@ BOOST_AUTO_TEST_CASE( write_request_with_body ) {
     r.replace_header("Content-Type","application/x-www-form-urlencoded");
     r.set_body("licenseID=string&content=string&paramsXML=string");
 
-    BOOST_CHECK_EQUAL( r.raw(), raw );
+    BOOST_CHECK( r.raw() == raw );
 }

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/CMakeLists.txt

@@ -1,12 +0,0 @@
-
-file (GLOB SOURCE_FILES *.cpp)
-file (GLOB HEADER_FILES *.hpp)
-
-init_target (test_logger)
-
-build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES})
-
-link_boost ()
-final_target ()
-
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

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:
@@ -34,8 +34,6 @@
 #include <websocketpp/concurrency/none.hpp>
 #include <websocketpp/concurrency/basic.hpp>
 
-typedef websocketpp::log::basic<websocketpp::concurrency::basic,websocketpp::log::alevel> basic_access_log_type;
-
 BOOST_AUTO_TEST_CASE( is_token_char ) {
     typedef websocketpp::log::basic<websocketpp::concurrency::none,websocketpp::log::elevel> error_log;
 
@@ -81,65 +79,3 @@ BOOST_AUTO_TEST_CASE( basic_concurrency ) {
     //std::cout << "|" << out.str() << "|" << std::endl;
     BOOST_CHECK( out.str().size() > 0 );
 }
-
-
-BOOST_AUTO_TEST_CASE( copy_constructor ) {
-    std::stringstream out;
-
-    basic_access_log_type logger1(0xffffffff,&out);
-    basic_access_log_type logger2(logger1);
-
-    logger2.set_channels(0xffffffff);
-    logger2.write(websocketpp::log::alevel::devel,"devel");
-    BOOST_CHECK( out.str().size() > 0 );
-}
-
-#ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-BOOST_AUTO_TEST_CASE( move_constructor ) {
-    std::stringstream out;
-
-    basic_access_log_type logger1(0xffffffff,&out);
-    basic_access_log_type logger2(std::move(logger1));
-
-    logger2.set_channels(0xffffffff);
-    logger2.write(websocketpp::log::alevel::devel,"devel");
-    BOOST_CHECK( out.str().size() > 0 );
-}
-
-// Emplace requires move assignment, which logger doesn't support right now
-// due to const members. This is pretty irritating and will probably result in
-// the const members being removed. For now though this test will fail to
-// compile
-/*BOOST_AUTO_TEST_CASE( emplace ) {
-    std::stringstream out1;
-    std::stringstream out2;
-
-    std::vector<basic_access_log_type> v;
-
-    v.emplace_back(websocketpp::log::level(0xffffffff),&out1);
-    v.emplace_back(websocketpp::log::level(0xffffffff),&out2);
-
-    v[0].set_channels(0xffffffff);
-    v[1].set_channels(0xffffffff);
-    v[0].write(websocketpp::log::alevel::devel,"devel");
-    v[1].write(websocketpp::log::alevel::devel,"devel");
-    BOOST_CHECK( out1.str().size() > 0 );
-    BOOST_CHECK( out2.str().size() > 0 );
-}*/
-#endif // #ifdef _WEBSOCKETPP_MOVE_SEMANTICS_
-
-// As long as there are const member variables these can't exist
-// These remain commented as they are useful for testing the deleted operators
-/*BOOST_AUTO_TEST_CASE( copy_assign ) {
-    basic_access_log_type logger1;
-    basic_access_log_type logger2;
-
-    logger2 = logger1;
-}
-
-BOOST_AUTO_TEST_CASE( move_assign ) {
-    basic_access_log_type logger1;
-    basic_access_log_type logger2;
-
-    logger2 = std::move(logger1);
-}*/

test/message_buffer/CMakeLists.txt

@@ -1,17 +0,0 @@
-# Test alloc message buffer strategy
-file (GLOB SOURCE alloc.cpp)
-
-init_target (test_message_alloc)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test message buffers
-file (GLOB SOURCE message.cpp)
-
-init_target (test_message_buffer)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

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/CMakeLists.txt

@@ -1,59 +0,0 @@
-# Generic processor tests
-file (GLOB SOURCE processor.cpp)
-
-init_target (test_processor)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Hybi00 processor tests
-file (GLOB SOURCE hybi00.cpp)
-
-init_target (test_processor_hybi00)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Hybi07 processor tests
-file (GLOB SOURCE hybi07.cpp)
-
-init_target (test_processor_hybi07)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Hybi08 processor tests
-file (GLOB SOURCE hybi08.cpp)
-
-init_target (test_processor_hybi08)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-if (ZLIB_FOUND)
-
-# Hybi13 processor tests
-file (GLOB SOURCE hybi13.cpp)
-
-init_target (test_processor_hybi13)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_zlib()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Permessage compression extension processor tests
-file (GLOB SOURCE extension_permessage_compress.cpp)
-
-init_target (test_processor_extension_permessage_compress)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_zlib()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-endif ( ZLIB_FOUND )

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,13 @@
 #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;
 };
 
 struct processor_setup {
@@ -55,16 +53,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 +94,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 +107,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 +120,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 +133,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 +146,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 +162,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,18 +40,16 @@
 #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;
 
-    static const size_t max_message_size = 16000000;
-
     /// Extension related config
     static const bool enable_extensions = false;
 
@@ -67,10 +65,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 +99,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 +117,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 +135,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 +153,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 +171,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,18 +40,16 @@
 #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;
 
-    static const size_t max_message_size = 16000000;
-
     /// Extension related config
     static const bool enable_extensions = false;
 
@@ -67,10 +65,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 +99,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 +117,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 +135,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 +153,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 +171,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;
 
@@ -60,18 +60,17 @@ struct stub_config {
     typedef websocketpp::extensions::permessage_deflate::disabled
         <permessage_deflate_config> permessage_deflate_type;
 
-    static const size_t max_message_size = 16000000;
     static const bool enable_extensions = false;
 };
 
 struct stub_config_ext {
-    typedef websocketpp::http::parser::request request_type;
-    typedef websocketpp::http::parser::response response_type;
+	typedef websocketpp::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;
 
@@ -82,7 +81,6 @@ struct stub_config_ext {
     typedef websocketpp::extensions::permessage_deflate::enabled
         <permessage_deflate_config> permessage_deflate_type;
 
-    static const size_t max_message_size = 16000000;
     static const bool enable_extensions = true;
 };
 
@@ -97,11 +95,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 +108,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 +143,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 +155,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 +167,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 +191,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 +218,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();
@@ -491,36 +489,6 @@ BOOST_AUTO_TEST_CASE( prepare_data_frame ) {
 
 }
 
-BOOST_AUTO_TEST_CASE( single_frame_message_too_large ) {
-    processor_setup env(true);
-    
-    env.p.set_max_message_size(3);
-    
-    uint8_t frame0[10] = {0x82, 0x84, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01};
-
-    // read message that is one byte too large
-    BOOST_CHECK_EQUAL( env.p.consume(frame0,10,env.ec), 6 );
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::message_too_big );
-}
-
-BOOST_AUTO_TEST_CASE( multiple_frame_message_too_large ) {
-    processor_setup env(true);
-    
-    env.p.set_max_message_size(4);
-    
-    uint8_t frame0[8] = {0x02, 0x82, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01};
-    uint8_t frame1[9] = {0x80, 0x83, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01};
-
-    // read first message frame with size under the limit
-    BOOST_CHECK_EQUAL( env.p.consume(frame0,8,env.ec), 8 );
-    BOOST_CHECK( !env.ec );
-    
-    // read second message frame that puts the size over the limit
-    BOOST_CHECK_EQUAL( env.p.consume(frame1,9,env.ec), 6 );
-    BOOST_CHECK_EQUAL( env.ec, websocketpp::processor::error::message_too_big );
-}
-
-
 
 BOOST_AUTO_TEST_CASE( client_handshake_request ) {
     processor_setup env(false);
@@ -638,7 +606,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 +614,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 +625,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 +637,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,,,,");
@@ -682,7 +650,7 @@ BOOST_AUTO_TEST_CASE( extension_negotiation_permessage_deflate ) {
     processor_setup_ext env(true);
 
     env.req.replace_header("Sec-WebSocket-Extensions",
-        "permessage-deflate; client_max_window_bits");
+        "permessage-deflate; c2s_max_window_bits");
 
     std::pair<websocketpp::lib::error_code,std::string> neg_results;
     neg_results = env.p.negotiate_extensions(env.req);

test/processors/processor.cpp

@@ -132,4 +132,4 @@ BOOST_AUTO_TEST_CASE( version_non_numeric ) {
     r.consume(handshake.c_str(),handshake.size());
 
     BOOST_CHECK(websocketpp::processor::get_websocket_version(r) == -1);
-}
+}

test/random/CMakeLists.txt

@@ -1,17 +0,0 @@
-# Test RNG policy none
-file (GLOB SOURCE none.cpp)
-
-init_target (test_random_none)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test RNG policy random_device
-file (GLOB SOURCE random_device.cpp)
-
-init_target (test_random_random_device)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

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/CMakeLists.txt

@@ -1,17 +0,0 @@
-# Test client role
-file (GLOB SOURCE client.cpp)
-
-init_target (test_roles_client)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test server role
-file (GLOB SOURCE server.cpp)
-
-init_target (test_roles_server)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")

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/CMakeLists.txt

@@ -1,61 +0,0 @@
-if (OPENSSL_FOUND)
-
-# Test transport integration
-file (GLOB SOURCE integration.cpp)
-
-init_target (test_transport)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport asio timers
-file (GLOB SOURCE asio/timers.cpp)
-
-init_target (test_transport_asio_timers)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-link_openssl()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-endif()
-
-# Test transport iostream base
-file (GLOB SOURCE iostream/base.cpp)
-
-init_target (test_transport_iostream_base)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport iostream endpoint
-file (GLOB SOURCE iostream/endpoint.cpp)
-
-init_target (test_transport_iostream_endpoint)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport iostream connection
-file (GLOB SOURCE iostream/connection.cpp)
-
-init_target (test_transport_iostream_connection)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-# Test transport asio base
-file (GLOB SOURCE asio/base.cpp)
-
-init_target (test_transport_asio_base)
-build_executable (${TARGET_NAME} ${SOURCE})
-link_boost ()
-final_target ()
-set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "test")
-
-

test/transport/SConscript

@@ -11,7 +11,7 @@ Import('tls_libs')
 env = env.Clone ()
 env_cpp11 = env_cpp11.Clone ()
 
-BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random','chrono'],env) + [platform_libs] + [tls_libs]
+BOOST_LIBS = boostlibs(['unit_test_framework','system','thread','random'],env) + [platform_libs] + [tls_libs]
 
 objs = env.Object('boost_integration.o', ["integration.cpp"], LIBS = BOOST_LIBS)
 prgs = env.Program('test_boost_integration', ["boost_integration.o"], LIBS = BOOST_LIBS)