diff options
author | jacobkeeler <jacob.keeler@livioradio.com> | 2021-03-04 14:41:35 -0500 |
---|---|---|
committer | jacobkeeler <jacob.keeler@livioradio.com> | 2021-03-04 14:41:35 -0500 |
commit | e5d4eece10a645cbec42e3df0e9c8d089e932996 (patch) | |
tree | d70232bb19af5f8b1dbea5d85385c7f2fdd66b12 | |
parent | ce33234562915d2d7901235f7f581448235dd4cc (diff) | |
download | sdl_core-fix/update_boost_installation.tar.gz |
Fix websocket implementationfix/update_boost_installation
3 files changed, 4 insertions, 5 deletions
diff --git a/src/components/hmi_message_handler/src/websocket_session.cc b/src/components/hmi_message_handler/src/websocket_session.cc index aa15e970b8..6e1c4b9bc4 100644 --- a/src/components/hmi_message_handler/src/websocket_session.cc +++ b/src/components/hmi_message_handler/src/websocket_session.cc @@ -40,7 +40,7 @@ SDL_CREATE_LOG_VARIABLE("HMIMessageHandler") WebsocketSession::WebsocketSession(boost::asio::ip::tcp::socket socket, CMessageBrokerController* controller) - : ws_(boost::asio::make_strand(socket.get_executor())) + : ws_(std::move(socket)) , controller_(controller) , stop(false) , m_receivingBuffer("") diff --git a/src/components/transport_manager/src/websocket_server/websocket_session.cc b/src/components/transport_manager/src/websocket_server/websocket_session.cc index a9f28cf03c..1def04d700 100644 --- a/src/components/transport_manager/src/websocket_server/websocket_session.cc +++ b/src/components/transport_manager/src/websocket_server/websocket_session.cc @@ -46,7 +46,7 @@ WebSocketSession<tcp::socket&>::WebSocketSession( DataSendDoneCallback data_send_done, DataSendFailedCallback data_send_failed, OnIOErrorCallback on_error) - : socket_(boost::asio::make_strand(socket.get_executor())) + : socket_(std::move(socket)) , ws_(socket_) , data_receive_(data_receive) , data_send_done_(data_send_done) @@ -64,7 +64,7 @@ WebSocketSession<ssl::stream<tcp::socket&> >::WebSocketSession( DataSendDoneCallback data_send_done, DataSendFailedCallback data_send_failed, OnIOErrorCallback on_error) - : socket_(boost::asio::make_strand(socket_.get_executor())) + : socket_(std::move(socket)) , ws_(socket_, ctx) , data_receive_(data_receive) , data_send_done_(data_send_done) diff --git a/src/components/transport_manager/test/sample_websocket_server.cc b/src/components/transport_manager/test/sample_websocket_server.cc index 6a4865e531..bd153adad4 100644 --- a/src/components/transport_manager/test/sample_websocket_server.cc +++ b/src/components/transport_manager/test/sample_websocket_server.cc @@ -42,8 +42,7 @@ void Fail(char const* tag, boost::system::error_code ec) { namespace sample { namespace websocket { -WSSession::WSServer::WSServer(tcp::socket&& socket) - : ws_(boost::asio::make_strand(socket.get_executor())) {} +WSSession::WSServer::WSServer(tcp::socket&& socket) : ws_(std::move(socket)) {} void WSSession::WSServer::AddURLRoute(const std::string& target) { url_routes_.insert(ParseRouteFromTarget(target)); |