From f6b68fe43106c4a60139852ddfcc0bf945aa3ce5 Mon Sep 17 00:00:00 2001 From: Peter Thorson Date: Sun, 8 Jan 2012 20:16:39 -0600 Subject: [PATCH] updates API version used by broadcast server example --- .../broadcast_server_tls/broadcast_admin_handler.hpp | 11 ++--------- examples/broadcast_server_tls/broadcast_handler.hpp | 7 ++++--- .../broadcast_server_tls/broadcast_server_tls.cpp | 4 ++-- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/examples/broadcast_server_tls/broadcast_admin_handler.hpp b/examples/broadcast_server_tls/broadcast_admin_handler.hpp index 8550414a1a..bf87c9d489 100644 --- a/examples/broadcast_server_tls/broadcast_admin_handler.hpp +++ b/examples/broadcast_server_tls/broadcast_admin_handler.hpp @@ -100,15 +100,8 @@ public: } void command_error(connection_ptr connection,const std::string msg) { - websocketpp::message::data_ptr m = connection->get_data_message(); - - if (m) { - m->reset(frame::opcode::TEXT); - m->set_payload("{\"type\":\"error\",\"value\":\""+msg+"\"}"); - connection->send(m); - } else { - // error no avaliable message buffers - } + std::string str = "{\"type\":\"error\",\"value\":\""+msg+"\"}"; + connection->send(str); } // close: - close this connection diff --git a/examples/broadcast_server_tls/broadcast_handler.hpp b/examples/broadcast_server_tls/broadcast_handler.hpp index 876a586c27..080b546ed5 100644 --- a/examples/broadcast_server_tls/broadcast_handler.hpp +++ b/examples/broadcast_server_tls/broadcast_handler.hpp @@ -92,9 +92,10 @@ public: void on_message(connection_ptr connection,message::data_ptr msg) { wscmd::cmd command = wscmd::parse(msg->get_payload()); + std::cout << "msg: " << msg->get_payload() << std::endl; + if (command.command == "ack") { handle_ack(connection,command); - //connection->recycle(msg); } else { broadcast_message(msg); } @@ -160,12 +161,12 @@ public: // broadcast to clients for (it = m_connections.begin(); it != m_connections.end(); it++) { //(*it)->send(msg->get_payload(),(msg->get_opcode() == frame::opcode::BINARY)); - for (int i = 0; i < 1; i++) { + for (int i = 0; i < 10; i++) { (*it)->send(msg); } } - new_msg.sent = m_connections.size()*1; + new_msg.sent = m_connections.size()*10; new_msg.acked = 0; } diff --git a/examples/broadcast_server_tls/broadcast_server_tls.cpp b/examples/broadcast_server_tls/broadcast_server_tls.cpp index 4805b0c367..939d611d34 100644 --- a/examples/broadcast_server_tls/broadcast_server_tls.cpp +++ b/examples/broadcast_server_tls/broadcast_server_tls.cpp @@ -109,9 +109,9 @@ int main(int argc, char* argv[]) { plain_endpoint_type e(h); e.alog().unset_level(websocketpp::log::alevel::ALL); - e.elog().unset_level(websocketpp::log::elevel::ALL); + e.elog().set_level(websocketpp::log::elevel::ALL); - e.alog().set_level(websocketpp::log::alevel::DEVEL); + //e.alog().set_level(websocketpp::log::alevel::DEVEL); std::cout << "Starting WebSocket broadcast server on port " << port << std::endl; e.listen(port);