diff --git a/examples/fuzzing_client/fuzzing_client.cpp b/examples/fuzzing_client/fuzzing_client.cpp index 3227cef2b2..c515e57ff8 100644 --- a/examples/fuzzing_client/fuzzing_client.cpp +++ b/examples/fuzzing_client/fuzzing_client.cpp @@ -25,37 +25,106 @@ * */ -#include "../../src/endpoint.hpp" #include "../../src/roles/client.hpp" +#include "../../src/websocketpp.hpp" +#include +#include #include -typedef websocketpp::endpoint plain_endpoint_type; -typedef plain_endpoint_type::handler_ptr plain_handler_ptr; -typedef plain_endpoint_type::connection_ptr connection_ptr; +using websocketpp::client; // base test case handler -class test_case_handler : public plain_endpoint_type::handler { +class test_case_handler : public client::handler { public: typedef test_case_handler type; - typedef plain_endpoint_type::connection_ptr connection_ptr; + + void start(connection_ptr con, int timeout) { + m_timer.reset(new boost::asio::deadline_timer( + con->get_io_service(), + boost::posix_time::seconds(0)) + ); + m_timer->expires_from_now(boost::posix_time::milliseconds(timeout)); + m_timer->async_wait(boost::bind(&type::on_timer, + this, + con, + boost::asio::placeholders::error)); - virtual void end(connection_ptr connection) { + m_start_time = boost::posix_time::microsec_clock::local_time(); + } + + virtual void end(connection_ptr con) { // test is over, give control back to controlling handler boost::posix_time::time_period len(m_start_time,m_end_time); - if (m_pass) { - std::cout << " passes in " << len.length() << std::endl; - } else { - std::cout << " fails in " << len.length() << std::endl; + switch (m_pass) { + case FAIL: + std::cout << " fails in " << len.length() << std::endl; + break; + case PASS: + std::cout << " passes in " << len.length() << std::endl; + break; + case TIME_OUT: + std::cout << " times out in " << len.length() << std::endl; + break; } - connection->close(websocketpp::close::status::NORMAL,""); + con->close(websocketpp::close::status::NORMAL,""); + } + + // Just does random ascii right now. True random UTF8 with multi-byte stuff + // would probably be better + void fill_utf8(std::string& data,size_t size,bool random = true) { + if (random) { + uint32_t val; + for (int i = 0; i < size; i++) { + if (i%4 == 0) { + val = uint32_t(rand()); + } + + data.push_back(char(((reinterpret_cast(&val)[i%4])%95)+32)); + } + } else { + data.assign(size,'*'); + } + } + + void fill_binary(std::string& data,size_t size,bool random = true) { + if (random) { + int32_t val; + for (int i = 0; i < size; i++) { + if (i%4 == 0) { + val = rand(); + } + + data.push_back((reinterpret_cast(&val))[i%4]); + } + } else { + data.assign(size,'*'); + } + } + + void on_timer(connection_ptr con,const boost::system::error_code& error) { + if (error == boost::system::errc::operation_canceled) { + return; // timer was canceled because test finished + } + + // time out + m_end_time = boost::posix_time::microsec_clock::local_time(); + m_pass = TIME_OUT; + this->end(con); } protected: - bool m_pass; + enum status { + FAIL = 0, + PASS = 1, + TIME_OUT = 2 + }; + + status m_pass; boost::posix_time::ptime m_start_time; boost::posix_time::ptime m_end_time; + boost::shared_ptr m_timer; }; // test class for 9.1.* and 9.2.* @@ -71,158 +140,131 @@ public: m_test_sizes[5] = 16777216; } - void on_open(connection_ptr connection) { + void on_open(connection_ptr con) { std::cout << "Test 9." << m_minor << "." << m_subtest; - - m_data.reserve(m_test_sizes[m_subtest-1]); + int timeout = 10000; // 10 sec + + // extend timeout to 100 sec for the longer tests + if ((m_minor == 1 && m_subtest >= 3) || (m_minor == 2 && m_subtest >= 5)) { + timeout = 100000; + } + if (m_minor == 1) { - fill_utf8(connection,true); - m_start_time = boost::posix_time::microsec_clock::local_time(); - connection->send(m_data,websocketpp::frame::opcode::TEXT); + fill_utf8(m_data,m_test_sizes[m_subtest-1],true); + start(con,timeout); + con->send(m_data,websocketpp::frame::opcode::TEXT); } else if (m_minor == 2) { - fill_binary(connection,true); - m_start_time = boost::posix_time::microsec_clock::local_time(); - connection->send(m_data,websocketpp::frame::opcode::BINARY); + fill_binary(m_data,m_test_sizes[m_subtest-1],true); + start(con,timeout); + con->send(m_data,websocketpp::frame::opcode::BINARY); } else { std::cout << " has unknown definition." << std::endl; } } - // Just does random ascii right now. True random UTF8 with multi-byte stuff - // would probably be better - void fill_utf8(connection_ptr connection,bool random = true) { - if (random) { - uint32_t data; - for (int i = 0; i < m_test_sizes[m_subtest-1]; i++) { - if (i%4 == 0) { - data = uint32_t(connection->rand()); - } - - m_data.push_back(char(((reinterpret_cast(&data)[i%4])%95)+32)); - } - } else { - m_data.assign(m_test_sizes[m_subtest-1],'*'); - } - } - - void fill_binary(connection_ptr connection, bool random = true) { - if (random) { - int32_t data; - for (int i = 0; i < m_test_sizes[m_subtest-1]; i++) { - if (i%4 == 0) { - data = connection->rand(); - } - - m_data.push_back((reinterpret_cast(&data))[i%4]); - } - } else { - m_data.assign(m_test_sizes[m_subtest-1],'*'); - } - } - - void on_message(connection_ptr connection,websocketpp::message::data_ptr msg) { + void on_message(connection_ptr con,websocketpp::message::data_ptr msg) { + m_timer->cancel(); m_end_time = boost::posix_time::microsec_clock::local_time(); // Check whether the echoed data matches exactly - m_pass = (msg->get_payload() == m_data); - - this->end(connection); + m_pass = ((msg->get_payload() == m_data) ? PASS : FAIL); + this->end(con); } private: int m_minor; int m_subtest; - size_t m_test_sizes[6]; + int m_test_sizes[6]; std::string m_data; }; // test class for 9.7.* and 9.8.* -/*class test_9_7_X : public test_case_handler { +class test_9_7_X : public test_case_handler { public: - test_9_1_X(int minor, int subtest) : m_minor(minor),m_subtest(subtest){ + test_9_7_X(int minor, int subtest) + : m_minor(minor), + m_subtest(subtest), + m_iterations(1000), + m_acks(0) + { // needs more C++11 intializer lists =( - m_test_sizes[0] = 65536; - m_test_sizes[1] = 262144; - m_test_sizes[2] = 1048576; - m_test_sizes[3] = 4194304; - m_test_sizes[4] = 8388608; - m_test_sizes[5] = 16777216; + m_test_sizes[0] = 0; + m_test_sizes[1] = 16; + m_test_sizes[2] = 64; + m_test_sizes[3] = 256; + m_test_sizes[4] = 1024; + m_test_sizes[5] = 4096; + + m_test_timeouts[0] = 60000; + m_test_timeouts[1] = 60000; + m_test_timeouts[2] = 60000; + m_test_timeouts[3] = 120000; + m_test_timeouts[4] = 240000; + m_test_timeouts[5] = 480000; } - void on_open(connection_ptr connection) { + void on_open(connection_ptr con) { std::cout << "Test 9." << m_minor << "." << m_subtest; + // Get a message buffer from the connection + message_ptr msg = con->get_data_message(); - + // reserve space in our local data buffer m_data.reserve(m_test_sizes[m_subtest-1]); - if (m_minor == 1) { - fill_utf8(connection,true); - m_start_time = boost::posix_time::microsec_clock::local_time(); - connection->send(m_data,false); - } else if (m_minor == 2) { - fill_binary(connection,true); - m_start_time = boost::posix_time::microsec_clock::local_time(); - connection->send(m_data,true); + // Reset message to appropriate opcode and fill local buffer with + // appropriate types of random data. + if (m_minor == 7) { + fill_utf8(m_data,m_test_sizes[m_subtest-1],true); + msg->reset(websocketpp::frame::opcode::TEXT); + } else if (m_minor == 8) { + fill_binary(m_data,m_test_sizes[m_subtest-1],true); + msg->reset(websocketpp::frame::opcode::BINARY); } else { std::cout << " has unknown definition." << std::endl; + return; } - } - - // Just does random ascii right now. True random UTF8 with multi-byte stuff - // would probably be better - void fill_utf8(connection_ptr connection,bool random = true) { - if (random) { - uint32_t data; - for (int i = 0; i < m_test_sizes[m_subtest-1]; i++) { - if (i%4 == 0) { - data = uint32_t(connection->rand()); - } - - m_data.push_back(char(((reinterpret_cast(&data)[i%4])%95)+32)); - } - } else { - m_data.assign(m_test_sizes[m_subtest-1],'*'); - } - } - - void fill_binary(connection_ptr connection, bool random = true) { - if (random) { - int32_t data; - for (int i = 0; i < m_test_sizes[m_subtest-1]; i++) { - if (i%4 == 0) { - data = connection->rand(); - } - - m_data.push_back((reinterpret_cast(&data))[i%4]); - } - } else { - m_data.assign(m_test_sizes[m_subtest-1],'*'); - } - } - - void on_message(connection_ptr connection,websocketpp::message::data_ptr msg) { - m_end_time = boost::posix_time::microsec_clock::local_time(); - // Check whether the echoed data matches exactly - m_pass = (msg->get_payload() == m_data); + msg->set_payload(m_data); - connection->recycle(msg); - this->end(connection); + // start test timer with 60-480 second timeout based on test length + start(con,m_test_timeouts[m_subtest-1]); + + // send 1000 copies of prepared message + for (int i = 0; i < m_iterations; i++) { + con->send(msg); + } + } + + void on_message(connection_ptr con, message_ptr msg) { + if (msg->get_payload() == m_data) { + m_acks++; + } + + if (m_acks == m_iterations) { + m_pass = PASS; + m_end_time = boost::posix_time::microsec_clock::local_time(); + m_timer->cancel(); + this->end(con); + } } private: int m_minor; int m_subtest; + int m_test_timeouts[6]; size_t m_test_sizes[6]; std::string m_data; -};*/ + int m_iterations; + int m_acks; + +}; int main(int argc, char* argv[]) { std::string uri; - + srand(time(NULL)); if (argc != 2) { uri = "ws://localhost:9002/"; @@ -230,16 +272,24 @@ int main(int argc, char* argv[]) { uri = argv[1]; } - std::vector tests; + std::vector tests; + // 9.1.x and 9.2.x tests for (int i = 1; i <= 2; i++) { for (int j = 1; j <= 6; j++) { - tests.push_back(plain_handler_ptr(new test_9_1_X(i,j))); + tests.push_back(client::handler_ptr(new test_9_1_X(i,j))); + } + } + + // 9.7.x and 9.8.x tests + for (int i = 7; i <= 8; i++) { + for (int j = 1; j <= 6; j++) { + tests.push_back(client::handler_ptr(new test_9_7_X(i,j))); } } try { - plain_endpoint_type endpoint(tests[0]); + client endpoint(tests[0]); endpoint.alog().unset_level(websocketpp::log::alevel::ALL); endpoint.elog().unset_level(websocketpp::log::elevel::ALL); @@ -253,9 +303,6 @@ int main(int argc, char* argv[]) { endpoint.connect(uri); endpoint.run(); } - - std::cout << "done" << std::endl; - } catch (std::exception& e) { std::cerr << "Exception: " << e.what() << std::endl; }