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

Revert "websocket fix, issue 13"

Browse source 
This reverts commit 0cf6f461b6
This commit is contained in:
blockc p 2020-07-02 17:07:12 +00:00
parent 0cf6f461b6
commit 13b7cfaec7
2 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -41,9 +41,6 @@ namespace fc { namespace http {
typedef std::function<void(const websocket_connection_ptr&)> on_connection_handler; typedef std::function<void(const websocket_connection_ptr&)> on_connection_handler;
// Recommended changes in the future
// TODO websocket_tls_server and websocket_server have almost the same interface and implementation,
// better refactor to remove duplicate code and to avoid undesired or unnecessary differences
class websocket_server class websocket_server
{ {
public: public:
@ -62,9 +59,6 @@ namespace fc { namespace http {
}; };
// Recommended changes in the future
// TODO websocket_tls_server and websocket_server have almost the same interface and implementation,
// better refactor to remove duplicate code and to avoid undesired or unnecessary differences
class websocket_tls_server class websocket_tls_server
{ {
public: public:
@ -76,9 +70,6 @@ namespace fc { namespace http {
void listen( uint16_t port ); void listen( uint16_t port );
void listen( const fc::ip::endpoint& ep ); void listen( const fc::ip::endpoint& ep );
void start_accept(); void start_accept();
uint16_t get_listening_port();
void stop_listening();
void close();
private: private:
friend class detail::websocket_tls_server_impl; friend class detail::websocket_tls_server_impl;

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

@ -1,4 +1,3 @@
#include <fc/network/http/websocket.hpp> #include <fc/network/http/websocket.hpp>
#include <websocketpp/config/asio_client.hpp> #include <websocketpp/config/asio_client.hpp>
#include <websocketpp/config/asio.hpp> #include <websocketpp/config/asio.hpp>
@ -734,4 +733,4 @@ namespace fc { namespace http {
return my->_connection; return my->_connection;
} FC_CAPTURE_AND_RETHROW( (uri) ) } } FC_CAPTURE_AND_RETHROW( (uri) ) }
} } // fc::http } } // fc::http