From 5d7e32fa10104aa726e9dace36be3266be0350c3 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Wed, 9 Jan 2013 08:05:43 -0600 Subject: [PATCH] rearranges some stuff --- examples/echo_server_tls/echo_server_tls.cpp | 5 +++-- websocketpp/roles/server_endpoint.hpp | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/examples/echo_server_tls/echo_server_tls.cpp b/examples/echo_server_tls/echo_server_tls.cpp index 27b223ed43..43ac0fc289 100644 --- a/examples/echo_server_tls/echo_server_tls.cpp +++ b/examples/echo_server_tls/echo_server_tls.cpp @@ -52,12 +52,13 @@ int main() { // Create a server endpoint server echo_server; + // Initialize ASIO + echo_server.init_asio(); + // Register our message handler echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2)); echo_server.set_tls_init_handler(bind(&on_tls_init,::_1)); - // Initialize ASIO - echo_server.init_asio(); // Listen on port 9002 echo_server.listen(9002); diff --git a/websocketpp/roles/server_endpoint.hpp b/websocketpp/roles/server_endpoint.hpp index 1e26376231..3fe95273e6 100644 --- a/websocketpp/roles/server_endpoint.hpp +++ b/websocketpp/roles/server_endpoint.hpp @@ -99,7 +99,8 @@ public: if (!con) { // TODO: should this be considered a server fatal error? - std::cout << "handle_accept got an invalid handle back" << std::endl; + std::cout << "handle_accept got an invalid handle back" + << std::endl; } else { if (ec) { con->terminate(); @@ -110,6 +111,7 @@ public: } } + // TODO: are there cases where we should terminate this loop? start_accept(); } private: