From 45bf6820d2d50503a9272d5b0164007eb51f4084 Mon Sep 17 00:00:00 2001
From: Vinnie Falco <vinnie.falco@gmail.com>
Date: Tue, 9 Jul 2013 18:45:04 -0700
Subject: [PATCH] Remove theConfig dependency in PeerDoor

---
 src/cpp/ripple/PeerDoor.cpp           | 30 ++++++++++++++++-----------
 src/cpp/ripple/PeerDoor.h             |  5 ++++-
 src/cpp/ripple/WSDoor.cpp             |  3 ++-
 src/cpp/ripple/ripple_Application.cpp |  6 +++++-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/cpp/ripple/PeerDoor.cpp b/src/cpp/ripple/PeerDoor.cpp
index 7ff4aa93a..7424eea3d 100644
--- a/src/cpp/ripple/PeerDoor.cpp
+++ b/src/cpp/ripple/PeerDoor.cpp
@@ -6,26 +6,32 @@
 
 SETUP_LOG (PeerDoor)
 
-PeerDoor::PeerDoor (boost::asio::io_service& io_service) :
-    mAcceptor (io_service,
-               boost::asio::ip::tcp::endpoint (boost::asio::ip::address ().from_string (theConfig.PEER_IP.empty () ? "0.0.0.0" : theConfig.PEER_IP),
-                              theConfig.PEER_PORT)),
-    mCtx (boost::asio::ssl::context::sslv23), mDelayTimer (io_service)
+// PEER_IP, PEER_PORT, PEER_SSL_CIPHER_LIST
+PeerDoor::PeerDoor (
+    std::string const& ip,
+    int port,
+    std::string const& sslCiphers,
+    boost::asio::io_service& io_service)
+    : mAcceptor (
+        io_service,
+        boost::asio::ip::tcp::endpoint (boost::asio::ip::address ().from_string (ip.empty () ? "0.0.0.0" : ip),
+        port))
+    , mCtx (boost::asio::ssl::context::sslv23)
+    , mDelayTimer (io_service)
 {
     mCtx.set_options (
-        boost::asio::ssl::context::default_workarounds
-        | boost::asio::ssl::context::no_sslv2
-        | boost::asio::ssl::context::single_dh_use);
+        boost::asio::ssl::context::default_workarounds |
+        boost::asio::ssl::context::no_sslv2 |
+        boost::asio::ssl::context::single_dh_use);
 
     SSL_CTX_set_tmp_dh_callback (mCtx.native_handle (), handleTmpDh);
 
-    if (1 != SSL_CTX_set_cipher_list (mCtx.native_handle (), theConfig.PEER_SSL_CIPHER_LIST.c_str ()))
+    if (SSL_CTX_set_cipher_list (mCtx.native_handle (), sslCiphers.c_str ()) != 1)
         std::runtime_error ("Error setting cipher list (no valid ciphers).");
 
-
-    if (!theConfig.PEER_IP.empty () && theConfig.PEER_PORT)
+    if (! ip.empty () && port != 0)
     {
-        Log (lsINFO) << "Peer port: " << theConfig.PEER_IP << " " << theConfig.PEER_PORT;
+        Log (lsINFO) << "Peer port: " << ip << " " << port;
         startListening ();
     }
 }
diff --git a/src/cpp/ripple/PeerDoor.h b/src/cpp/ripple/PeerDoor.h
index 823e1cb57..61aa999c2 100644
--- a/src/cpp/ripple/PeerDoor.h
+++ b/src/cpp/ripple/PeerDoor.h
@@ -14,7 +14,10 @@ Handles incoming connections from other Peers
 class PeerDoor : LeakChecked <PeerDoor>
 {
 public:
-    PeerDoor (boost::asio::io_service& io_service);
+    PeerDoor (std::string const& ip,
+              int port,
+              std::string const& sslCiphers,
+              boost::asio::io_service& io_service);
 
     boost::asio::ssl::context&  getSSLContext ()
     {
diff --git a/src/cpp/ripple/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp
index d01335904..ba6a3423e 100644
--- a/src/cpp/ripple/WSDoor.cpp
+++ b/src/cpp/ripple/WSDoor.cpp
@@ -19,7 +19,8 @@ SETUP_LOG (WSDoor)
 // - We only talk to NetworkOPs (so we will work even in thin mode)
 // - NetworkOPs is smart enough to subscribe and or pass back messages
 //
-
+// VFALCO NOTE NetworkOPs isn't used here...
+//
 void WSDoor::startListening ()
 {
     setCallingThreadName ("websocket");
diff --git a/src/cpp/ripple/ripple_Application.cpp b/src/cpp/ripple/ripple_Application.cpp
index d0c86c4b2..8203cd1af 100644
--- a/src/cpp/ripple/ripple_Application.cpp
+++ b/src/cpp/ripple/ripple_Application.cpp
@@ -569,7 +569,11 @@ void Application::setup ()
     {
         try
         {
-            mPeerDoor = new PeerDoor (mIOService);
+            mPeerDoor = new PeerDoor (
+                theConfig.PEER_IP,
+                theConfig.PEER_PORT,
+                theConfig.PEER_SSL_CIPHER_LIST,
+                mIOService);
         }
         catch (const std::exception& e)
         {