From a549f2b99e57f1213b010067d2e13cf175c7d174 Mon Sep 17 00:00:00 2001 From: Daniel Pocock Date: Fri, 31 May 2013 14:47:41 +0200 Subject: [PATCH] Renaming contents of sip_client from echo_client --- examples/sip_client/CMakeLists.txt | 2 +- examples/sip_client/SConscript | 4 ++-- .../{echo_client.cpp => sip_client.cpp} | 24 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) rename examples/sip_client/{echo_client.cpp => sip_client.cpp} (76%) diff --git a/examples/sip_client/CMakeLists.txt b/examples/sip_client/CMakeLists.txt index a3d6d3b2e5..3ac386d562 100644 --- a/examples/sip_client/CMakeLists.txt +++ b/examples/sip_client/CMakeLists.txt @@ -2,7 +2,7 @@ file (GLOB SOURCE_FILES *.cpp) file (GLOB HEADER_FILES *.hpp) -init_target (echo_client) +init_target (sip_client) build_executable (${TARGET_NAME} ${SOURCE_FILES} ${HEADER_FILES}) diff --git a/examples/sip_client/SConscript b/examples/sip_client/SConscript index 291ade5df0..1ea8b1c5be 100644 --- a/examples/sip_client/SConscript +++ b/examples/sip_client/SConscript @@ -15,9 +15,9 @@ prgs = [] # if a C++11 environment is avaliable build using that, otherwise use boost if env_cpp11.has_key('WSPP_CPP11_ENABLED'): ALL_LIBS = boostlibs(['system'],env_cpp11) + [platform_libs] + [polyfill_libs] - prgs += env_cpp11.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS) + prgs += env_cpp11.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS) else: ALL_LIBS = boostlibs(['system','regex','random'],env) + [platform_libs] + [polyfill_libs] - prgs += env.Program('echo_client', ["echo_client.cpp"], LIBS = ALL_LIBS) + prgs += env.Program('sip_client', ["sip_client.cpp"], LIBS = ALL_LIBS) Return('prgs') diff --git a/examples/sip_client/echo_client.cpp b/examples/sip_client/sip_client.cpp similarity index 76% rename from examples/sip_client/echo_client.cpp rename to examples/sip_client/sip_client.cpp index 5ce319a9d8..04803be799 100644 --- a/examples/sip_client/echo_client.cpp +++ b/examples/sip_client/sip_client.cpp @@ -28,7 +28,7 @@ void on_message(client* c, websocketpp::connection_hdl hdl, message_ptr msg) { int main(int argc, char* argv[]) { // Create a server endpoint - client echo_client; + client sip_client; std::string uri = "ws://localhost:9001"; @@ -38,36 +38,36 @@ int main(int argc, char* argv[]) { try { // We expect there to be a lot of errors, so suppress them - echo_client.clear_access_channels(websocketpp::log::alevel::all); - echo_client.clear_error_channels(websocketpp::log::elevel::all); + sip_client.clear_access_channels(websocketpp::log::alevel::all); + sip_client.clear_error_channels(websocketpp::log::elevel::all); // Initialize ASIO - echo_client.init_asio(); + sip_client.init_asio(); // Register our handlers - echo_client.set_message_handler(bind(&on_message,&echo_client,::_1,::_2)); + sip_client.set_message_handler(bind(&on_message,&sip_client,::_1,::_2)); websocketpp::lib::error_code ec; - client::connection_ptr con = echo_client.get_connection(uri+"/getCaseCount", ec); - echo_client.connect(con); + client::connection_ptr con = sip_client.get_connection(uri+"/getCaseCount", ec); + sip_client.connect(con); // Start the ASIO io_service run loop - echo_client.run(); + sip_client.run(); std::cout << "case count: " << case_count << std::endl; for (int i = 1; i <= case_count; i++) { - echo_client.reset(); + sip_client.reset(); std::stringstream url; url << uri << "/runCase?case=" << i << "&agent=WebSocket++/0.3.0-dev"; - con = echo_client.get_connection(url.str(), ec); + con = sip_client.get_connection(url.str(), ec); - echo_client.connect(con); + sip_client.connect(con); - echo_client.run(); + sip_client.run(); } std::cout << "done" << std::endl;