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

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 -39
2 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit aa54e3938c - Show all commits

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

@ -103,15 +103,5 @@ namespace fc { namespace http {
std::unique_ptr<detail::websocket_tls_client_impl> smy; std::unique_ptr<detail::websocket_tls_client_impl> smy;
std::vector<std::pair<std::string,std::string>> headers; std::vector<std::pair<std::string,std::string>> headers;
}; };
class websocket_tls_client
{
public:
websocket_tls_client( const std::string& ca_filename = "_default" );
~websocket_tls_client();
websocket_connection_ptr connect( const std::string& uri );
private:
std::unique_ptr<detail::websocket_tls_client_impl> my;
};
} } } }

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

@ -676,11 +676,6 @@ namespace fc { namespace http {
} }
websocket_tls_client::websocket_tls_client( const std::string& ca_filename ):my( new detail::websocket_tls_client_impl( ca_filename ) ) {}
websocket_tls_client::~websocket_tls_client(){ }
websocket_client::websocket_client( const std::string& ca_filename ) websocket_client::websocket_client( const std::string& ca_filename )
:my( new detail::websocket_client_impl() ), :my( new detail::websocket_client_impl() ),
smy(new detail::websocket_tls_client_impl( ca_filename )) smy(new detail::websocket_tls_client_impl( ca_filename ))
@ -764,28 +759,4 @@ namespace fc { namespace http {
headers.push_back( std::make_pair(key, value) ); headers.push_back( std::make_pair(key, value) );
} }
websocket_connection_ptr websocket_tls_client::connect( const std::string& uri )
{ try {
websocketpp::lib::error_code ec;
my->_connected = promise<void>::create("websocket::connect");
my->_client.set_open_handler( [=]( websocketpp::connection_hdl hdl ){
auto con = my->_client.get_con_from_hdl(hdl);
my->_connection = std::make_shared<detail::websocket_connection_impl<
detail::websocket_tls_client_connection_type>>( con );
my->_closed = promise<void>::create("websocket::closed");
my->_connected->set_value();
});
auto con = my->_client.get_connection( uri, ec );
if( ec )
{
FC_ASSERT( !ec, "error: ${e}", ("e",ec.message()) );
}
my->_client.connect(con);
my->_connected->wait();
return my->_connection;
} FC_CAPTURE_AND_RETHROW( (uri) ) }
} } // fc::http } } // fc::http