updates basic examples to use new convenience typedefs
This commit is contained in:
1 parent
63c50a520b
commit
01516318d6
4 files changed
+56
-63
No files matched your search
@@ -36,3 +36,5 @@ examples/stress_client/stress_client
|
||||
examples/broadcast_server_tls/broadcast_server
|
||||
|
||||
test/basic/perf
|
||||
|
||||
examples/echo_server_tls/echo_server_tls
|
||||
@@ -25,34 +25,25 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "../../src/endpoint.hpp"
|
||||
#include "../../src/roles/client.hpp"
|
||||
#include "../../src/websocketpp.hpp"
|
||||
|
||||
#include <iostream>
|
||||
|
||||
typedef websocketpp::endpoint<websocketpp::role::client,websocketpp::socket::plain> plain_endpoint_type;
|
||||
typedef plain_endpoint_type::handler_ptr plain_handler_ptr;
|
||||
typedef plain_endpoint_type::connection_ptr connection_ptr;
|
||||
using websocketpp::client;
|
||||
|
||||
class echo_client_handler : public plain_endpoint_type::handler {
|
||||
class echo_client_handler : public client::handler {
|
||||
public:
|
||||
typedef echo_client_handler type;
|
||||
typedef plain_endpoint_type::connection_ptr connection_ptr;
|
||||
|
||||
void on_message(connection_ptr connection,websocketpp::message::data::ptr msg) {
|
||||
if (connection->get_resource() == "/getCaseCount") {
|
||||
void on_message(connection_ptr con, message_ptr msg) {
|
||||
if (con->get_resource() == "/getCaseCount") {
|
||||
std::cout << "Detected " << msg->get_payload() << " test cases." << std::endl;
|
||||
m_case_count = atoi(msg->get_payload().c_str());
|
||||
} else {
|
||||
connection->send(msg->get_payload(),msg->get_opcode());
|
||||
con->send(msg->get_payload(),msg->get_opcode());
|
||||
}
|
||||
}
|
||||
|
||||
void http(connection_ptr connection) {
|
||||
//connection->set_body("HTTP Response!!");
|
||||
}
|
||||
|
||||
void on_fail(connection_ptr connection) {
|
||||
void on_fail(connection_ptr con) {
|
||||
std::cout << "connection failed" << std::endl;
|
||||
}
|
||||
|
||||
@@ -63,23 +54,24 @@ public:
|
||||
int main(int argc, char* argv[]) {
|
||||
std::string uri = "ws://localhost:9001/";
|
||||
|
||||
if (argc > 2) {
|
||||
std::cout << "Usage: `echo_client test_url`" << std::endl;
|
||||
} else {
|
||||
if (argc == 2) {
|
||||
uri = argv[1];
|
||||
|
||||
} else if (argc > 2) {
|
||||
std::cout << "Usage: `echo_client test_url`" << std::endl;
|
||||
}
|
||||
|
||||
try {
|
||||
plain_handler_ptr handler(new echo_client_handler());
|
||||
connection_ptr connection;
|
||||
plain_endpoint_type endpoint(handler);
|
||||
client::handler::ptr handler(new echo_client_handler());
|
||||
client::connection_ptr con;
|
||||
client endpoint(handler);
|
||||
|
||||
endpoint.alog().unset_level(websocketpp::log::alevel::ALL);
|
||||
endpoint.elog().unset_level(websocketpp::log::elevel::ALL);
|
||||
|
||||
connection = endpoint.connect(uri+"getCaseCount");
|
||||
con = endpoint.connect(uri+"getCaseCount");
|
||||
|
||||
connection->add_request_header("User Agent","WebSocket++/0.2.0");
|
||||
con->add_request_header("User Agent","WebSocket++/0.2.0");
|
||||
|
||||
endpoint.run();
|
||||
|
||||
@@ -92,7 +84,7 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
url << uri << "/runCase?case=" << i << "&agent=\"WebSocket++/0.2.0\"";
|
||||
|
||||
connection = endpoint.connect(url.str());
|
||||
con = endpoint.connect(url.str());
|
||||
|
||||
endpoint.run();
|
||||
}
|
||||
|
||||
@@ -25,19 +25,15 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "../../src/endpoint.hpp"
|
||||
#include "../../src/roles/server.hpp"
|
||||
#include "../../src/websocketpp.hpp"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
typedef websocketpp::endpoint<websocketpp::role::server,websocketpp::socket::plain> endpoint_type;
|
||||
typedef endpoint_type::handler_ptr handler_ptr;
|
||||
using websocketpp::server;
|
||||
|
||||
class echo_server_handler : public endpoint_type::handler {
|
||||
class echo_server_handler : public server::handler {
|
||||
public:
|
||||
typedef endpoint_type::connection_ptr connection_ptr;
|
||||
|
||||
void on_message(connection_ptr connection,websocketpp::message::data_ptr msg) {
|
||||
void on_message(connection_ptr connection,message_ptr msg) {
|
||||
connection->send(msg->get_payload(),msg->get_opcode());
|
||||
}
|
||||
};
|
||||
@@ -55,14 +51,14 @@ int main(int argc, char* argv[]) {
|
||||
}
|
||||
|
||||
try {
|
||||
handler_ptr h(new echo_server_handler());
|
||||
endpoint_type e(h);
|
||||
server::handler::ptr h(new echo_server_handler());
|
||||
server echo_endpoint(h);
|
||||
|
||||
e.alog().unset_level(websocketpp::log::alevel::ALL);
|
||||
e.elog().unset_level(websocketpp::log::elevel::ALL);
|
||||
echo_endpoint.alog().unset_level(websocketpp::log::alevel::ALL);
|
||||
echo_endpoint.elog().unset_level(websocketpp::log::elevel::ALL);
|
||||
|
||||
std::cout << "Starting WebSocket echo server on port " << port << std::endl;
|
||||
e.listen(port);
|
||||
echo_endpoint.listen(port);
|
||||
} catch (std::exception& e) {
|
||||
std::cerr << "Exception: " << e.what() << std::endl;
|
||||
}
|
||||
|
||||
@@ -25,22 +25,25 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#include "../../src/endpoint.hpp"
|
||||
#include "../../src/roles/server.hpp"
|
||||
#include "../../src/sockets/ssl.hpp"
|
||||
#include "../../src/sockets/tls.hpp"
|
||||
#include "../../src/websocketpp.hpp"
|
||||
|
||||
#include <cstring>
|
||||
|
||||
typedef websocketpp::endpoint<websocketpp::role::server,websocketpp::socket::plain> plain_endpoint_type;
|
||||
typedef websocketpp::endpoint<websocketpp::role::server,websocketpp::socket::ssl> tls_endpoint_type;
|
||||
typedef plain_endpoint_type::handler_ptr plain_handler_ptr;
|
||||
typedef tls_endpoint_type::handler_ptr tls_handler_ptr;
|
||||
//typedef websocketpp::endpoint<websocketpp::role::server,websocketpp::socket::plain> plain_endpoint_type;
|
||||
//typedef websocketpp::endpoint<websocketpp::role::server,websocketpp::socket::ssl> tls_endpoint_type;
|
||||
//typedef plain_endpoint_type::handler_ptr plain_handler_ptr;
|
||||
//typedef tls_endpoint_type::handler_ptr tls_handler_ptr;
|
||||
|
||||
using websocketpp::server;
|
||||
using websocketpp::server_tls;
|
||||
|
||||
template <typename endpoint_type>
|
||||
class echo_server_handler : public endpoint_type::handler {
|
||||
public:
|
||||
typedef echo_server_handler<endpoint_type> type;
|
||||
typedef typename endpoint_type::connection_ptr connection_ptr;
|
||||
typedef typename endpoint_type::handler::connection_ptr connection_ptr;
|
||||
typedef typename endpoint_type::handler::message_ptr message_ptr;
|
||||
|
||||
std::string get_password() const {
|
||||
return "test";
|
||||
@@ -54,21 +57,21 @@ public:
|
||||
boost::asio::ssl::context::no_sslv2 |
|
||||
boost::asio::ssl::context::single_dh_use);
|
||||
context->set_password_callback(boost::bind(&type::get_password, this));
|
||||
context->use_certificate_chain_file("/Users/zaphoyd/Documents/ZS/websocketpp/src/ssl/server.pem");
|
||||
context->use_private_key_file("/Users/zaphoyd/Documents/ZS/websocketpp/src/ssl/server.pem", boost::asio::ssl::context::pem);
|
||||
context->use_tmp_dh_file("/Users/zaphoyd/Documents/ZS/websocketpp/src/ssl/dh512.pem");
|
||||
context->use_certificate_chain_file("../../src/ssl/server.pem");
|
||||
context->use_private_key_file("../../src/ssl/server.pem", boost::asio::ssl::context::pem);
|
||||
context->use_tmp_dh_file("../../src/ssl/dh512.pem");
|
||||
} catch (std::exception& e) {
|
||||
std::cout << e.what() << std::endl;
|
||||
}
|
||||
return context;
|
||||
}
|
||||
|
||||
void on_message(connection_ptr connection,websocketpp::message::data_ptr msg) {
|
||||
connection->send(msg->get_payload(),msg->get_opcode());
|
||||
void on_message(connection_ptr con,message_ptr msg) {
|
||||
con->send(msg->get_payload(),msg->get_opcode());
|
||||
}
|
||||
|
||||
void http(connection_ptr connection) {
|
||||
connection->set_body("HTTP Response!!");
|
||||
void http(connection_ptr con) {
|
||||
con->set_body("<!DOCTYPE html><html><head><title>WebSocket++ TLS certificate test</title></head><body><h1>WebSocket++ TLS certificate test</h1><p>This is an HTTP(S) page served by a WebSocket++ server for the purposes of confirming that certificates are working since browsers normally silently ignore certificate issues.</p></body></html>");
|
||||
}
|
||||
};
|
||||
|
||||
@@ -91,25 +94,25 @@ int main(int argc, char* argv[]) {
|
||||
|
||||
try {
|
||||
if (tls) {
|
||||
tls_handler_ptr h(new echo_server_handler<tls_endpoint_type>());
|
||||
tls_endpoint_type e(h);
|
||||
server_tls::handler::ptr handler(new echo_server_handler<server_tls>());
|
||||
server_tls endpoint(handler);
|
||||
|
||||
e.alog().unset_level(websocketpp::log::alevel::ALL);
|
||||
e.elog().unset_level(websocketpp::log::elevel::ALL);
|
||||
endpoint.alog().unset_level(websocketpp::log::alevel::ALL);
|
||||
endpoint.elog().unset_level(websocketpp::log::elevel::ALL);
|
||||
|
||||
std::cout << "Starting Secure WebSocket echo server on port "
|
||||
<< port << std::endl;
|
||||
e.listen(port);
|
||||
endpoint.listen(port);
|
||||
} else {
|
||||
plain_handler_ptr h(new echo_server_handler<plain_endpoint_type>());
|
||||
plain_endpoint_type e(h);
|
||||
server::handler::ptr handler(new echo_server_handler<server>());
|
||||
server endpoint(handler);
|
||||
|
||||
e.alog().unset_level(websocketpp::log::alevel::ALL);
|
||||
e.elog().unset_level(websocketpp::log::elevel::ALL);
|
||||
endpoint.alog().unset_level(websocketpp::log::alevel::ALL);
|
||||
endpoint.elog().unset_level(websocketpp::log::elevel::ALL);
|
||||
|
||||
std::cout << "Starting WebSocket echo server on port "
|
||||
<< port << std::endl;
|
||||
e.listen(port);
|
||||
endpoint.listen(port);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user