Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolve conflicts

Browse source 
# Conflicts:
#   src/network/http/websocket.cpp
This commit is contained in:
blockc p 2020-08-12 02:56:35 +00:00
commit a8f70ff05b
2 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/fc/network/http/websocket.hpp
View file

@ -72,6 +72,9 @@ namespace fc { namespace http {
void listen( uint16_t port );
void listen( const fc::ip::endpoint& ep );
void start_accept();
uint16_t get_listening_port();
void stop_listening();
void close();
private:
friend class detail::websocket_tls_server_impl;

24
src/network/http/websocket.cpp
View file

@ -132,14 +132,10 @@ namespace fc { namespace http {
typedef websocketpp::transport::asio::tls_socket::endpoint socket_type;
};
typedef websocketpp::transport::asio::endpoint<transport_config>
transport_type;
typedef websocketpp::transport::asio::endpoint<transport_config> transport_type;
};
using websocketpp::connection_hdl;
typedef websocketpp::server<asio_with_stub_log> websocket_server_type;
typedef websocketpp::server<asio_tls_stub_log> websocket_tls_server_type;
@ -399,17 +395,6 @@ namespace fc { namespace http {
};
typedef websocketpp::client<asio_with_stub_log> websocket_client_type;
typedef websocketpp::client<asio_tls_stub_log> websocket_tls_client_type;
@ -465,6 +450,8 @@ namespace fc { namespace http {
if( _closed )
_closed->wait();
}
fc::promise<void>::ptr _connected;
fc::promise<void>::ptr _closed;
fc::thread& _client_thread;
@ -622,7 +609,7 @@ namespace fc { namespace http {
{ try {
if( uri.substr(0,4) == "wss:" )
return secure_connect(uri);
FC_ASSERT( uri.substr(0,3) == "ws:" );
FC_ASSERT( uri.substr(0,4) == "wss:" || uri.substr(0,3) == "ws:", "Unsupported protocol" );
// wlog( "connecting to ${uri}", ("uri",uri));
websocketpp::lib::error_code ec;
@ -650,7 +637,8 @@ namespace fc { namespace http {
{ try {
if( uri.substr(0,3) == "ws:" )
return connect(uri);
FC_ASSERT( uri.substr(0,4) == "wss:" );
FC_ASSERT( uri.substr(0,4) == "wss:" || uri.substr(0,3) == "ws:", "Unsupported protocol" );
// wlog( "connecting to ${uri}", ("uri",uri));
websocketpp::lib::error_code ec;