From 80d1a6c6ff107825dfa7cd6eaff494d3bb9e5c0d Mon Sep 17 00:00:00 2001 From: Arthur Britto Date: Fri, 22 Jun 2012 01:46:13 -0700 Subject: [PATCH] Make websocket server non-ssl for now. --- src/WSDoor.cpp | 8 ++++++-- src/WSDoor.h | 8 +++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/WSDoor.cpp b/src/WSDoor.cpp index 3b1dc53681..0d5c71ac41 100644 --- a/src/WSDoor.cpp +++ b/src/WSDoor.cpp @@ -59,8 +59,12 @@ void WSDoor::startListening() SSL_CTX_set_tmp_dh_callback(mCtx->native_handle(), handleTmpDh); - websocketpp::server_tls::handler::ptr handler(new WSServerHandler(mCtx)); - mEndpoint = new websocketpp::server_tls(handler); + websocketpp::WSDOOR_SERVER::handler::ptr handler(new WSServerHandler(mCtx)); + + mEndpoint = new websocketpp::WSDOOR_SERVER(handler); + + // mEndpoint->alog().unset_level(websocketpp::log::alevel::ALL); + // mEndpoint->elog().unset_level(websocketpp::log::elevel::ALL); Log(lsINFO) << "listening>"; diff --git a/src/WSDoor.h b/src/WSDoor.h index 86260ca851..f44de663f3 100644 --- a/src/WSDoor.h +++ b/src/WSDoor.h @@ -10,10 +10,16 @@ #include #include +#if 1 +#define WSDOOR_SERVER server +#else +#define WSDOOR_SERVER server_tls +#endif + class WSDoor { private: - websocketpp::server_tls* mEndpoint; + websocketpp::WSDOOR_SERVER* mEndpoint; boost::thread* mThread; void startListening();