ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete multitls and proxy websocket features

Browse Source
This commit is contained in:
Vinnie Falco
2014-10-31 15:13:55 -07:00
parent 8101154d5e
commit 73187d8832
6 changed files with 21 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/ripple/app/main/Application.cpp
View File

@@ -742,9 +742,8 @@ public:
if (!getConfig ().WEBSOCKET_IP.empty () && getConfig ().WEBSOCKET_PORT)
{
m_wsPrivateDoor.reset (WSDoor::New (*m_resourceManager,
getOPs(), getConfig ().WEBSOCKET_IP,
getConfig ().WEBSOCKET_PORT, false, false,
m_wsSSLContext->get ()));
getOPs(), getConfig ().WEBSOCKET_IP, getConfig ().WEBSOCKET_PORT,
false, m_wsSSLContext->get ()));
if (m_wsPrivateDoor == nullptr)
{
@@ -762,9 +761,8 @@ public:
if (!getConfig ().WEBSOCKET_PUBLIC_IP.empty () && getConfig ().WEBSOCKET_PUBLIC_PORT)
{
m_wsPublicDoor.reset (WSDoor::New (*m_resourceManager,
getOPs(), getConfig ().WEBSOCKET_PUBLIC_IP,
getConfig ().WEBSOCKET_PUBLIC_PORT, true, false,
m_wsSSLContext->get ()));
getOPs(), getConfig ().WEBSOCKET_PUBLIC_IP, getConfig ().WEBSOCKET_PUBLIC_PORT,
true, m_wsSSLContext->get ()));
if (m_wsPublicDoor == nullptr)
{

26
src/ripple/app/websocket/WSDoor.cpp
View File

@@ -45,15 +45,14 @@ class WSDoorImp
{
public:
WSDoorImp (Resource::Manager& resourceManager,
InfoSub::Source& source, std::string const& strIp,
int iPort, bool bPublic, bool bProxy, boost::asio::ssl::context& ssl_context)
InfoSub::Source& source, std::string const& strIp, int iPort,
bool bPublic, boost::asio::ssl::context& ssl_context)
: WSDoor (source)
, Thread ("websocket")
, m_resourceManager (resourceManager)
, m_source (source)
, m_ssl_context (ssl_context)
, mPublic (bPublic)
, mProxy (bProxy)
, mIp (strIp)
, mPort (iPort)
{
@@ -72,14 +71,14 @@ private:
boost::format ("Websocket: %s: Listening: %s %d ") %
(mPublic ? "Public" : "Private") % mIp % mPort);
websocketpp::server_multitls::handler::ptr handler (
new WSServerHandler <websocketpp::server_multitls> (
m_resourceManager, m_source, m_ssl_context, mPublic, mProxy));
websocketpp::server_autotls::handler::ptr handler (
new WSServerHandler <websocketpp::server_autotls> (
m_resourceManager, m_source, m_ssl_context, mPublic));
{
ScopedLockType lock (m_endpointLock);
m_endpoint = std::make_shared<websocketpp::server_multitls> (handler);
m_endpoint = std::make_shared<websocketpp::server_autotls> (handler);
}
// Call the main-event-loop of the websocket server.
@@ -120,7 +119,7 @@ private:
void onStop ()
{
std::shared_ptr<websocketpp::server_multitls> endpoint;
std::shared_ptr<websocketpp::server_autotls> endpoint;
{
ScopedLockType lock (m_endpointLock);
@@ -146,9 +145,8 @@ private:
boost::asio::ssl::context& m_ssl_context;
LockType m_endpointLock;
std::shared_ptr<websocketpp::server_multitls> m_endpoint;
std::shared_ptr<websocketpp::server_autotls> m_endpoint;
bool mPublic;
bool mProxy;
std::string mIp;
int mPort;
};
@@ -162,16 +160,16 @@ WSDoor::WSDoor (Stoppable& parent)
//------------------------------------------------------------------------------
WSDoor* WSDoor::New (Resource::Manager& resourceManager,
InfoSub::Source& source, std::string const& strIp,
int iPort, bool bPublic, bool bProxy, boost::asio::ssl::context& ssl_context)
WSDoor* WSDoor::New (Resource::Manager& resourceManager, InfoSub::Source& source,
std::string const& strIp, int iPort, bool bPublic,
boost::asio::ssl::context& ssl_context)
{
std::unique_ptr <WSDoor> door;
try
{
door = std::make_unique <WSDoorImp> (resourceManager,
source, strIp, iPort, bPublic, bProxy, ssl_context);
source, strIp, iPort, bPublic, ssl_context);
}
catch (...)
{

6
src/ripple/app/websocket/WSDoor.h
View File

@@ -29,11 +29,11 @@ protected:
explicit WSDoor (Stoppable& parent);
public:
virtual ~WSDoor () { }
virtual ~WSDoor() = default;
static WSDoor* New (Resource::Manager& resourceManager,
InfoSub::Source& source, std::string const& strIp,
int iPort, bool bPublic, bool bProxy, boost::asio::ssl::context& ssl_context);
InfoSub::Source& source, std::string const& strIp, int iPort,
bool bPublic, boost::asio::ssl::context& ssl_context);
};
} // ripple

8
src/ripple/app/websocket/WSServerHandler.h
View File

@@ -77,16 +77,14 @@ protected:
typedef hash_map <connection_ptr, wsc_ptr> MapType;
MapType mMap;
bool const mPublic;
bool const mProxy;
public:
WSServerHandler (Resource::Manager& resourceManager,
InfoSub::Source& source, boost::asio::ssl::context& ssl_context, bool bPublic, bool bProxy)
InfoSub::Source& source, boost::asio::ssl::context& ssl_context, bool bPublic)
: m_resourceManager (resourceManager)
, m_source (source)
, m_ssl_context (ssl_context)
, mPublic (bPublic)
, mProxy (bProxy)
{
}
@@ -409,10 +407,6 @@ public:
{
return m_ssl_context;
}
bool get_proxy ()
{
return mProxy;
}
// Respond to http requests.
bool http (connection_ptr cpClient)