Upgrade websocketpp to 0.8.1, disable TCP_NO_DELAY for now.

Author: kpeeters

client_server/CMakeLists.txt

@@ -122,6 +122,12 @@ add_definitions(
 # Make targets.
 #---------------------------------------------------------------------------
 
+# add_executable(tst tst.cc)
+# target_link_libraries(tst
+# 	${Boost_LIBRARIES}
+# 	Threads::Threads
+# 	)
+
 # Server executable
 if(MSVC AND CADABRA_DEBUG_BUILD)
 	add_executable(cadabra-server ${CADABRA_SERVER_SRC})

client_server/Server.cc

@@ -21,7 +21,7 @@
 #include "CdbPython.hh"
 #include "SympyCdb.hh"
 
-// #define DEBUG 1
+//#define DEBUG 1
 
 using websocketpp::lib::placeholders::_1;
 using websocketpp::lib::placeholders::_2;
@@ -204,7 +204,8 @@ std::string Server::run_string(const std::string& blk, bool handle_output)
 void Server::on_socket_init(websocketpp::connection_hdl, boost::asio::ip::tcp::socket & s)
 	{
 	boost::asio::ip::tcp::no_delay option(true);
-	s.set_option(option);
+	// FIXME: this used to work in older websocketpp
+//	s.lowest_layer().set_option(option);
 	}
 
 Server::Connection::Connection()
@@ -501,14 +502,21 @@ void Server::run()
 		wserver.clear_access_channels(websocketpp::log::alevel::all);
 		wserver.clear_error_channels(websocketpp::log::elevel::all);
 
+		wserver.init_asio();
+		wserver.set_reuse_addr(true);
+
 		wserver.set_socket_init_handler(bind(&Server::on_socket_init, this, ::_1,::_2));
 		wserver.set_message_handler(bind(&Server::on_message, this, ::_1, ::_2));
 		wserver.set_open_handler(bind(&Server::on_open,this,::_1));
 		wserver.set_close_handler(bind(&Server::on_close,this,::_1));
 
-		wserver.init_asio();
-		wserver.set_reuse_addr(true);
+#ifdef DEBUG
+		std::cerr << "going to listen" << std::endl;
+#endif
 		wserver.listen(websocketpp::lib::asio::ip::tcp::v4(), 0);
+#ifdef DEBUG
+		std::cerr << "going to accept" << std::endl;
+#endif
 		wserver.start_accept();
 		websocketpp::lib::asio::error_code ec;
 		auto p = wserver.get_local_endpoint(ec);

config/buildbot.sh

@@ -7,8 +7,8 @@ function runbuild {
 	 # Start the VM and wait for it to come up.
 	 echo "Starting build bot for $1, ssh port $3"
 	 ssh buildbothost "nohup VBoxHeadless -s '$1' > /tmp/buildbot.out 2> /tmp/buildbot.err < /dev/null &"
-	 echo "Waiting 10 seconds for VM to start up..."
-	 sleep 10
+	 echo "Waiting 20 seconds for VM to start up..."
+	 sleep 20
 
 	 # Setup the tunnel to the VM; a local port $3 gets mapped
 	 # to a port $3 on the build host, which is forwarded by 
@@ -57,16 +57,16 @@ function runbuild {
 
 # Parameters: VM name, package type, local ssh port, folder name on web server.
 
-runbuild "Ubuntu_18.04"        ".deb" 7017 ubuntu1804
-runbuild "Fedora_28"           ".rpm" 7020 fedora28
-runbuild "Fedora_29"           ".rpm" 7025 fedora29               
-runbuild "Mint_19"             ".deb" 7022 mint19
-runbuild "OpenSUSE_15"         ".rpm" 7024 opensuse150
-runbuild "OpenSUSE_Tumbleweed" ".rpm" 7023 opensusetw   
-runbuild "CentOS_7"            ".rpm" 7004 centos7     
-runbuild "Scientific_Linux_74" ".rpm" 7013 scientific7x
-runbuild "Debian_921"          ".deb" 7014 debian9
-runbuild "Debian_Buster"       ".deb" 7021 debian10
+#runbuild "Ubuntu_18.04"        ".deb" 7017 ubuntu1804
+#runbuild "Fedora_28"           ".rpm" 7020 fedora28
+#runbuild "Fedora_29"           ".rpm" 7025 fedora29               
+#runbuild "Mint_19"             ".deb" 7022 mint19
+runbuild "OpenSUSE_15"         ".rpm" 7024 opensuse150  ssh error
+#runbuild "OpenSUSE_Tumbleweed" ".rpm" 7023 opensusetw   ssh error
+#runbuild "CentOS_7"            ".rpm" 7004 centos7      cmake/packaging clash
+#runbuild "Scientific_Linux_74" ".rpm" 7013 scientific7x
+#runbuild "Debian_921"          ".deb" 7014 debian9
+#runbuild "Debian_Buster"       ".deb" 7021 debian10
 
 # Outdated versions:
 # runbuild "Mint_18" ".deb" 7002 mint18                   ERROR

libs/websocketpp/CMakeLists.txt

@@ -1,18 +1,42 @@
 
 ############ Setup project and cmake
-
-# Project name
-project (websocketpp)
-
 # Minimum cmake requirement. We should require a quite recent
 # cmake for the dependency find macros etc. to be up to date.
-cmake_minimum_required (VERSION 2.6)
+cmake_minimum_required (VERSION 2.8.8)
 
+############ Paths
+
+set (WEBSOCKETPP_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
+set (WEBSOCKETPP_INCLUDE ${WEBSOCKETPP_ROOT}/websocketpp)
+set (WEBSOCKETPP_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR})
+set (WEBSOCKETPP_BIN ${WEBSOCKETPP_BUILD_ROOT}/bin)
+set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib)
+
+# CMake install step prefix. I assume linux users want the prefix to
+# be the default /usr or /usr/local so this is only adjusted on Windows.
+# This must be set prior to any call to project or it will not be read correctly.
+# - Windows: Build the INSTALL project in your solution file.
+# - Linux/OSX: make install.
+if (WIN32)
+    set (CMAKE_INSTALL_PREFIX "${WEBSOCKETPP_ROOT}/install" CACHE PATH "")
+endif ()
+
+############ Project name and version
 set (WEBSOCKETPP_MAJOR_VERSION 0)
-set (WEBSOCKETPP_MINOR_VERSION 7)
-set (WEBSOCKETPP_PATCH_VERSION 0)
+set (WEBSOCKETPP_MINOR_VERSION 8)
+set (WEBSOCKETPP_PATCH_VERSION 1)
 set (WEBSOCKETPP_VERSION ${WEBSOCKETPP_MAJOR_VERSION}.${WEBSOCKETPP_MINOR_VERSION}.${WEBSOCKETPP_PATCH_VERSION})
 
+if(POLICY CMP0048)
+  cmake_policy(GET CMP0048 _version_policy)
+endif()
+
+if(_version_allowed STREQUAL NEW)
+  project (websocketpp VERSION ${WEBSOCKETPP_VERSION})
+else()
+  project (websocketpp)
+endif()
+
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(INSTALL_INCLUDE_DIR include CACHE PATH "Installation directory for header files")
@@ -44,21 +68,6 @@ set (CMAKE_CONFIGURATION_TYPES "Release;RelWithDebInfo;Debug" CACHE STRING "Conf
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 include (CMakeHelpers)
 
-############ Paths
-
-set (WEBSOCKETPP_ROOT ${CMAKE_CURRENT_SOURCE_DIR})
-set (WEBSOCKETPP_INCLUDE ${WEBSOCKETPP_ROOT}/websocketpp)
-set (WEBSOCKETPP_BUILD_ROOT ${CMAKE_CURRENT_BINARY_DIR})
-set (WEBSOCKETPP_BIN ${WEBSOCKETPP_BUILD_ROOT}/bin)
-set (WEBSOCKETPP_LIB ${WEBSOCKETPP_BUILD_ROOT}/lib)
-
-# CMake install step prefix. I assume linux users want the prefix to
-# be the default /usr or /usr/local so this is only adjusted on Windows.
-# - Windows: Build the INSTALL project in your solution file.
-# - Linux/OSX: make install.
-if (MSVC)
-    set (CMAKE_INSTALL_PREFIX "${WEBSOCKETPP_ROOT}/install")
-endif ()
 
 ############  Build customization
 
@@ -193,7 +202,7 @@ if (BUILD_TESTS OR BUILD_EXAMPLES)
 	endif ()
 
     if (NOT Boost_USE_STATIC_LIBS)
-        add_definitions (/DBOOST_TEST_DYN_LINK)
+        add_definitions (-DBOOST_TEST_DYN_LINK)
     endif ()
 
     set (Boost_FIND_REQUIRED TRUE)
@@ -250,8 +259,16 @@ print_used_build_config()
 
 export (PACKAGE websocketpp)
 
-configure_file (websocketpp-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake" @ONLY)
-configure_file (websocketpp-configVersion.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake" @ONLY)
+include(CMakePackageConfigHelpers)
+configure_package_config_file(websocketpp-config.cmake.in
+  "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-config.cmake"
+  PATH_VARS INSTALL_INCLUDE_DIR
+  INSTALL_DESTINATION "${INSTALL_CMAKE_DIR}"
+  NO_CHECK_REQUIRED_COMPONENTS_MACRO
+)
+write_basic_package_version_file("${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/websocketpp-configVersion.cmake"
+  VERSION ${WEBSOCKETPP_VERSION}
+  COMPATIBILITY ExactVersion)
 
 # Install the websocketpp-config.cmake and websocketpp-configVersion.cmake
 install (FILES

libs/websocketpp/websocketpp-config.cmake.in

@@ -3,5 +3,12 @@
 #  WEBSOCKETPP_FOUND - indicates that the module was found
 #  WEBSOCKETPP_INCLUDE_DIR - include directories
 
+@PACKAGE_INIT@
+set_and_check(WEBSOCKETPP_INCLUDE_DIR "@PACKAGE_INSTALL_INCLUDE_DIR@")
 set(WEBSOCKETPP_FOUND TRUE)
-set(WEBSOCKETPP_INCLUDE_DIR "@INSTALL_INCLUDE_DIR@")
+
+#This is a bit of a hack, but it works well. It also allows continued support of CMake 2.8
+if(${CMAKE_VERSION} VERSION_GREATER 3.0.0 OR ${CMAKE_VERSION} VERSION_EQUAL 3.0.0)
+  add_library(websocketpp::websocketpp INTERFACE IMPORTED)
+  set_target_properties(websocketpp::websocketpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${WEBSOCKETPP_INCLUDE_DIR}")
+endif()

libs/websocketpp/websocketpp-configVersion.cmake.in

@@ -142,6 +142,11 @@ namespace status {
     /// or reconnect to the same IP upon user action.
     static value const try_again_later = 1013;
 
+    /// Indicates that the server was acting as a gateway or proxy and received
+    /// an invalid response from the upstream server. This is similar to 502
+    /// HTTP Status Code.
+    static value const bad_gateway = 1014;
+
     /// An endpoint failed to perform a TLS handshake
     /**
      * Designated for use in applications expecting a status code to indicate
@@ -178,7 +183,7 @@ namespace status {
      */
     inline bool reserved(value code) {
         return ((code >= rsv_start && code <= rsv_end) ||
-                code == 1004 || code == 1014);
+                code == 1004);
     }
 
     /// First value in range that is always invalid on the wire
@@ -248,6 +253,12 @@ namespace status {
                 return "Extension required";
             case internal_endpoint_error:
                 return "Internal endpoint error";
+            case service_restart:
+                return "Service restart";
+            case try_again_later:
+                return "Try again later";
+            case bad_gateway:
+                return "Bad gateway";
             case tls_handshake:
                 return "TLS handshake failure";
             case subprotocol_error:

libs/websocketpp/websocketpp/close.hpp

@@ -101,9 +101,19 @@ namespace lib {
             bool is_neg(T duration) {
                 return duration.count() < 0;
             }
-            inline lib::chrono::milliseconds milliseconds(long duration) {
-                return lib::chrono::milliseconds(duration);
-            }
+
+            // If boost believes it has std::chrono available it will use it
+            // so we should also use it for things that relate to boost, even
+            // if the library would otherwise use boost::chrono.
+            #if defined(BOOST_ASIO_HAS_STD_CHRONO)
+                inline std::chrono::milliseconds milliseconds(long duration) {
+                    return std::chrono::milliseconds(duration);
+                }
+            #else
+                inline lib::chrono::milliseconds milliseconds(long duration) {
+                    return lib::chrono::milliseconds(duration);
+                }
+            #endif
         #else
             // Using boost::asio <1.49 we pretend a deadline timer is a steady
             // timer and wrap the negative detection and duration conversion

libs/websocketpp/websocketpp/common/asio.hpp

@@ -65,7 +65,6 @@ namespace lib {
 #ifdef _WEBSOCKETPP_CPP11_MEMORY_
     using std::shared_ptr;
     using std::weak_ptr;
-    using std::auto_ptr;
     using std::enable_shared_from_this;
     using std::static_pointer_cast;
     using std::make_shared;

libs/websocketpp/websocketpp/common/memory.hpp

@@ -51,7 +51,11 @@
     #endif
 #endif
 
-#ifdef _WEBSOCKETPP_CPP11_THREAD_
+#if defined(_WEBSOCKETPP_MINGW_THREAD_)
+    #include <mingw-threads/mingw.thread.h>
+    #include <mingw-threads/mingw.mutex.h>
+    #include <mingw-threads/mingw.condition_variable.h>
+#elif defined(_WEBSOCKETPP_CPP11_THREAD_)
     #include <thread>
     #include <mutex>
     #include <condition_variable>
@@ -64,7 +68,7 @@
 namespace websocketpp {
 namespace lib {
 
-#ifdef _WEBSOCKETPP_CPP11_THREAD_
+#if defined(_WEBSOCKETPP_CPP11_THREAD_) || defined(_WEBSOCKETPP_MINGW_THREAD_)
     using std::mutex;
     using std::lock_guard;
     using std::thread;