From 4f914f847787d4f6938064daaccf3670c710bf08 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Tue, 8 Jan 2013 07:48:32 -0600 Subject: [PATCH] updates tests and echo server to new handler interface --- examples/echo_server/echo_server.cpp | 107 ++++----------------------- test/connection/connection.cpp | 19 +++-- 2 files changed, 28 insertions(+), 98 deletions(-) diff --git a/examples/echo_server/echo_server.cpp b/examples/echo_server/echo_server.cpp index d0a1057a62..3995c01d1b 100644 --- a/examples/echo_server/echo_server.cpp +++ b/examples/echo_server/echo_server.cpp @@ -6,90 +6,6 @@ typedef websocketpp::server server; -/*class handler : public server::handler { - bool validate(connection_ptr con) { - std::cout << "handler validate" << std::endl; - return true; - } - - void http(connection_ptr con) { - std::cout << "handler http" << std::endl; - con->set_status(websocketpp::http::status_code::OK); - con->set_body("foo"); - } - - void on_load(connection_ptr con, ptr old_handler) { - std::cout << "handler on_load" << std::endl; - } - void on_unload(connection_ptr con, ptr new_handler) { - std::cout << "handler on_unload" << std::endl; - } - - void on_open(connection_ptr con) { - std::cout << "handler on_open" << std::endl; - } - void on_fail(connection_ptr con) { - std::cout << "handler on_fail" << std::endl; - } - - void on_message(connection_ptr con, message_ptr msg) { - std::cout << "handler on_message" << std::endl; - //std::cout << "Message was: " << msg->get_payload() << std::endl; - try { - con->send(msg->get_payload(),msg->get_opcode()); - } catch (const websocketpp::lib::error_code& e) { - std::cout << "Echo failed because: " << e << "(" << e.message() << ")" << std::endl; - } - } - - bool on_ping(connection_ptr con, const std::string & msg) { - std::cout << "handler on_ping" << std::endl; - return true; - } - - void on_pong(connection_ptr con, const std::string & msg) { - std::cout << "handler on_pong" << std::endl; - } - - void on_pong_timeout(connection_ptr con, const std::string & msg) { - std::cout << "handler on_pong_timeout" << std::endl; - } - - void on_close(connection_ptr con) { - std::cout << "handler on_close" << std::endl; - } - - void on_interrupt(connection_ptr con) { - std::cout << "handler on_interrupt" << std::endl; - } -};*/ - -class test_handler { -public: - test_handler(server& s): m_server(s) {} - - void on_open(websocketpp::connection_hdl hdl) { - std::cout << "on_open called with hdl: " << hdl.lock().get() << std::endl; - m_server.interrupt(hdl); - } -private: - server& m_server; -}; - -void on_open(server* s, websocketpp::connection_hdl hdl) { - std::cout << "on_open called with hdl: " << hdl.lock().get() << std::endl; - s->interrupt(hdl); -} - -void on_interrupt(server* s, websocketpp::connection_hdl hdl) { - std::cout << "on_interrupt called with hdl: " << hdl.lock().get() << std::endl; -} - -void on_tcp_init(websocketpp::connection_hdl hdl) { - std::cout << "on_tcp_init called with hdl: " << hdl.lock().get() << std::endl; -} - - using websocketpp::lib::placeholders::_1; using websocketpp::lib::placeholders::_2; using websocketpp::lib::bind; @@ -97,26 +13,31 @@ using websocketpp::lib::bind; // pull out the type of messages sent by our config typedef websocketpp::config::asio::message_type::ptr message_ptr; -void on_message(server* s,websocketpp::connection_hdl hdl,message_ptr msg) { +// 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; - //s->get_con_from_hdl(hdl)->send(msg->get_payload(),msg->get_opcode()); + + 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() { - server echo_server; + // Create a server endpoint + server echo_server; + // Initialize ASIO echo_server.init_asio(); - test_handler t(echo_server); - - echo_server.set_open_handler(bind(&on_open,&echo_server,::_1)); - echo_server.set_interrupt_handler(bind(&on_interrupt,&echo_server,::_1)); - echo_server.set_tcp_init_handler(&on_tcp_init); + // Register our message handler echo_server.set_message_handler(bind(&on_message,&echo_server,::_1,::_2)); - // Listen + // Listen on port 9002 echo_server.listen(9002); // Start the server accept loop diff --git a/test/connection/connection.cpp b/test/connection/connection.cpp index e0521e1215..0026b088ae 100644 --- a/test/connection/connection.cpp +++ b/test/connection/connection.cpp @@ -37,8 +37,13 @@ #include typedef websocketpp::server server; +typedef websocketpp::config::core::message_type::ptr message_ptr; -class echo_handler : public server::handler { +using websocketpp::lib::placeholders::_1; +using websocketpp::lib::placeholders::_2; +using websocketpp::lib::bind; + +/*class echo_handler : public server::handler { bool validate(connection_ptr con) { std::cout << "handler validate" << std::endl; if (con->get_origin() != "http://www.example.com") { @@ -61,14 +66,18 @@ class echo_handler : public server::handler { } void on_close(connection_ptr con) {} -}; +};*/ + +void on_message(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) { - server::handler::ptr h(new echo_handler()); - - server test_server(h); + server test_server; server::connection_ptr con; + test_server.set_message_handler(bind(&on_message,&test_server,::_1,::_2)); + std::stringstream output; test_server.register_ostream(&output);