diff --git a/src/cpp/ripple/Config.cpp b/src/cpp/ripple/Config.cpp index 1eee97fba..d45d35d65 100644 --- a/src/cpp/ripple/Config.cpp +++ b/src/cpp/ripple/Config.cpp @@ -178,8 +178,8 @@ Config::Config() RPC_PORT = 5001; WEBSOCKET_PORT = SYSTEM_WEBSOCKET_PORT; WEBSOCKET_PUBLIC_PORT = SYSTEM_WEBSOCKET_PUBLIC_PORT; - WEBSOCKET_PUBLIC_SECURE = true; - WEBSOCKET_SECURE = false; + WEBSOCKET_PUBLIC_SECURE = 1; + WEBSOCKET_SECURE = 0; NUMBER_CONNECTIONS = 30; // a new ledger every minute @@ -340,10 +340,10 @@ void Config::load() WEBSOCKET_PUBLIC_PORT = boost::lexical_cast(strTemp); if (sectionSingleB(secConfig, SECTION_WEBSOCKET_SECURE, strTemp)) - WEBSOCKET_SECURE = boost::lexical_cast(strTemp); + WEBSOCKET_SECURE = boost::lexical_cast(strTemp); if (sectionSingleB(secConfig, SECTION_WEBSOCKET_PUBLIC_SECURE, strTemp)) - WEBSOCKET_PUBLIC_SECURE = boost::lexical_cast(strTemp); + WEBSOCKET_PUBLIC_SECURE = boost::lexical_cast(strTemp); sectionSingleB(secConfig, SECTION_WEBSOCKET_SSL_CERT, WEBSOCKET_SSL_CERT); sectionSingleB(secConfig, SECTION_WEBSOCKET_SSL_CHAIN, WEBSOCKET_SSL_CHAIN); diff --git a/src/cpp/ripple/Config.h b/src/cpp/ripple/Config.h index abb1c5662..6fe20fcc4 100644 --- a/src/cpp/ripple/Config.h +++ b/src/cpp/ripple/Config.h @@ -101,11 +101,12 @@ public: // Websocket networking parameters std::string WEBSOCKET_PUBLIC_IP; // XXX Going away. Merge with the inbound peer connction. int WEBSOCKET_PUBLIC_PORT; - bool WEBSOCKET_PUBLIC_SECURE; + int WEBSOCKET_PUBLIC_SECURE; std::string WEBSOCKET_IP; int WEBSOCKET_PORT; - bool WEBSOCKET_SECURE; + int WEBSOCKET_SECURE; + std::string WEBSOCKET_SSL_CERT; std::string WEBSOCKET_SSL_CHAIN; std::string WEBSOCKET_SSL_KEY;