ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-21 19:45:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete websocket PROXY port

Browse Source
This commit is contained in:
Vinnie Falco
2014-10-31 15:08:38 -07:00
parent c02937fd6f
commit 8101154d5e
5 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,7 +198,6 @@ public:
std::unique_ptr <RPCDoor> m_rpcDoor; std::unique_ptr <RPCDoor> m_rpcDoor;
std::unique_ptr <WSDoor> m_wsPublicDoor; std::unique_ptr <WSDoor> m_wsPublicDoor;
std::unique_ptr <WSDoor> m_wsPrivateDoor; std::unique_ptr <WSDoor> m_wsPrivateDoor;
std::unique_ptr <WSDoor> m_wsProxyDoor;
beast::WaitableEvent m_stop; beast::WaitableEvent m_stop;
@@ -777,19 +776,6 @@ public:
{ {
m_journal.info << "WebSocket public interface: disabled"; m_journal.info << "WebSocket public interface: disabled";
} }
if (!getConfig ().WEBSOCKET_PROXY_IP.empty () && getConfig ().WEBSOCKET_PROXY_PORT)
{
m_wsProxyDoor.reset (WSDoor::New (*m_resourceManager,
getOPs(), getConfig ().WEBSOCKET_PROXY_IP,
getConfig ().WEBSOCKET_PROXY_PORT, true, true,
m_wsSSLContext->get ()));
if (m_wsProxyDoor == nullptr)
{
beast::FatalError ("Could not open the WebSocket public interface.",
__FILE__, __LINE__);
}
}
//---------------------------------------------------------------------- //----------------------------------------------------------------------

4
src/ripple/core/Config.h
View File

@@ -327,10 +327,6 @@ public:
int WEBSOCKET_PUBLIC_PORT; int WEBSOCKET_PUBLIC_PORT;
int WEBSOCKET_PUBLIC_SECURE; int WEBSOCKET_PUBLIC_SECURE;
std::string WEBSOCKET_PROXY_IP; // XXX Going away. Merge with the inbound peer connction.
int WEBSOCKET_PROXY_PORT;
int WEBSOCKET_PROXY_SECURE;
std::string WEBSOCKET_IP; std::string WEBSOCKET_IP;
int WEBSOCKET_PORT; int WEBSOCKET_PORT;
int WEBSOCKET_SECURE; int WEBSOCKET_SECURE;

3
src/ripple/core/ConfigSections.h
View File

@@ -90,9 +90,6 @@ struct ConfigSection
#define SECTION_WEBSOCKET_PUBLIC_IP "websocket_public_ip" #define SECTION_WEBSOCKET_PUBLIC_IP "websocket_public_ip"
#define SECTION_WEBSOCKET_PUBLIC_PORT "websocket_public_port" #define SECTION_WEBSOCKET_PUBLIC_PORT "websocket_public_port"
#define SECTION_WEBSOCKET_PUBLIC_SECURE "websocket_public_secure" #define SECTION_WEBSOCKET_PUBLIC_SECURE "websocket_public_secure"
#define SECTION_WEBSOCKET_PROXY_IP "websocket_proxy_ip"
#define SECTION_WEBSOCKET_PROXY_PORT "websocket_proxy_port"
#define SECTION_WEBSOCKET_PROXY_SECURE "websocket_proxy_secure"
#define SECTION_WEBSOCKET_PING_FREQ "websocket_ping_frequency" #define SECTION_WEBSOCKET_PING_FREQ "websocket_ping_frequency"
#define SECTION_WEBSOCKET_IP "websocket_ip" #define SECTION_WEBSOCKET_IP "websocket_ip"
#define SECTION_WEBSOCKET_PORT "websocket_port" #define SECTION_WEBSOCKET_PORT "websocket_port"

10
src/ripple/core/impl/Config.cpp
View File

@@ -245,8 +245,6 @@ Config::Config ()
WEBSOCKET_PORT = 6562; WEBSOCKET_PORT = 6562;
WEBSOCKET_PUBLIC_PORT = 6563; WEBSOCKET_PUBLIC_PORT = 6563;
WEBSOCKET_PUBLIC_SECURE = 1; WEBSOCKET_PUBLIC_SECURE = 1;
WEBSOCKET_PROXY_PORT = 0;
WEBSOCKET_PROXY_SECURE = 1;
WEBSOCKET_SECURE = 0; WEBSOCKET_SECURE = 0;
WEBSOCKET_PING_FREQ = (5 * 60); WEBSOCKET_PING_FREQ = (5 * 60);
@@ -577,20 +575,12 @@ void Config::load ()
if (getSingleSection (secConfig, SECTION_WEBSOCKET_PUBLIC_PORT, strTemp)) if (getSingleSection (secConfig, SECTION_WEBSOCKET_PUBLIC_PORT, strTemp))
WEBSOCKET_PUBLIC_PORT = beast::lexicalCastThrow <int> (strTemp); WEBSOCKET_PUBLIC_PORT = beast::lexicalCastThrow <int> (strTemp);
(void) getSingleSection (secConfig, SECTION_WEBSOCKET_PROXY_IP, WEBSOCKET_PROXY_IP);
if (getSingleSection (secConfig, SECTION_WEBSOCKET_PROXY_PORT, strTemp))
WEBSOCKET_PROXY_PORT = beast::lexicalCastThrow <int> (strTemp);
if (getSingleSection (secConfig, SECTION_WEBSOCKET_SECURE, strTemp)) if (getSingleSection (secConfig, SECTION_WEBSOCKET_SECURE, strTemp))
WEBSOCKET_SECURE = beast::lexicalCastThrow <int> (strTemp); WEBSOCKET_SECURE = beast::lexicalCastThrow <int> (strTemp);
if (getSingleSection (secConfig, SECTION_WEBSOCKET_PUBLIC_SECURE, strTemp)) if (getSingleSection (secConfig, SECTION_WEBSOCKET_PUBLIC_SECURE, strTemp))
WEBSOCKET_PUBLIC_SECURE = beast::lexicalCastThrow <int> (strTemp); WEBSOCKET_PUBLIC_SECURE = beast::lexicalCastThrow <int> (strTemp);
if (getSingleSection (secConfig, SECTION_WEBSOCKET_PROXY_SECURE, strTemp))
WEBSOCKET_PROXY_SECURE = beast::lexicalCastThrow <int> (strTemp);
if (getSingleSection (secConfig, SECTION_WEBSOCKET_PING_FREQ, strTemp)) if (getSingleSection (secConfig, SECTION_WEBSOCKET_PING_FREQ, strTemp))
WEBSOCKET_PING_FREQ = beast::lexicalCastThrow <int> (strTemp); WEBSOCKET_PING_FREQ = beast::lexicalCastThrow <int> (strTemp);

3
src/ripple/overlay/impl/PeerImp.h
View File

@@ -116,8 +116,7 @@ private:
ShortId shortId_ = 0; ShortId shortId_ = 0;
// Updated at each stage of the connection process to reflect // Updated at each stage of the connection process to reflect
// the current conditions as closely as possible. This includes // the current conditions as closely as possible.
// the case where we learn the true IP via a PROXY handshake.
beast::IP::Endpoint remote_address_; beast::IP::Endpoint remote_address_;
// These is up here to prevent warnings about order of initializations // These is up here to prevent warnings about order of initializations