ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of the redundant SSL contexts.

Browse Source
This commit is contained in:
JoelKatz
2013-01-10 09:10:40 -08:00
parent ce3ce7820b
commit cfcb1a2c11
4 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/cpp/ripple/Application.h
View File

@@ -114,6 +114,7 @@ public:
LoadManager& getLoadManager() { return mLoadMgr; }
LoadFeeTrack& getFeeTrack() { return mFeeTrack; }
TXQueue& getTxnQueue() { return mTxnQueue; }
PeerDoor& getPeerDoor() { return *mPeerDoor; }
bool isNew(const uint256& s) { return mSuppressions.addSuppression(s); }

19
src/cpp/ripple/ConnectionPool.cpp
View File

@@ -10,6 +10,7 @@
#include "Config.h"
#include "Peer.h"
#include "PeerDoor.h"
#include "Application.h"
#include "utils.h"
#include "Log.h"
@@ -28,21 +29,6 @@ void splitIpPort(const std::string& strIpPort, std::string& strIp, int& iPort)
iPort = boost::lexical_cast<int>(vIpPort[1]);
}
ConnectionPool::ConnectionPool(boost::asio::io_service& io_service) :
mLastPeer(0),
mCtx(boost::asio::ssl::context::sslv23),
mScanTimer(io_service),
mPolicyTimer(io_service)
{
mCtx.set_options(
boost::asio::ssl::context::default_workarounds
| boost::asio::ssl::context::no_sslv2
| boost::asio::ssl::context::single_dh_use);
if (1 != SSL_CTX_set_cipher_list(mCtx.native_handle(), theConfig.PEER_SSL_CIPHER_LIST.c_str()))
std::runtime_error("Error setting cipher list (no valid ciphers).");
}
void ConnectionPool::start()
{
if (theConfig.RUN_STANDALONE)
@@ -329,7 +315,8 @@ Peer::pointer ConnectionPool::peerConnect(const std::string& strIp, int iPort)
if ((it = mIpMap.find(pipPeer)) == mIpMap.end())
{
Peer::pointer ppNew(Peer::create(theApp->getIOService(), mCtx, ++mLastPeer));
Peer::pointer ppNew(Peer::create(theApp->getIOService(),
theApp->getPeerDoor().getSSLContext(), ++mLastPeer));
// Did not find it. Not already connecting or connected.
ppNew->connect(strIp, iPort);

6
src/cpp/ripple/ConnectionPool.h
View File

@@ -38,8 +38,6 @@ private:
// Connections with have a 64-bit identifier
boost::unordered_map<uint64, Peer::pointer> mPeerIdMap;
boost::asio::ssl::context mCtx;
Peer::pointer mScanning;
boost::asio::deadline_timer mScanTimer;
std::string mScanIp;
@@ -60,7 +58,9 @@ private:
Peer::pointer peerConnect(const std::string& strIp, int iPort);
public:
ConnectionPool(boost::asio::io_service& io_service);
ConnectionPool(boost::asio::io_service& io_service) :
mLastPeer(0), mScanTimer(io_service), mPolicyTimer(io_service)
{ ; }
// Begin enforcing connection policy.
void start();

1
src/cpp/ripple/PeerDoor.h
View File

@@ -25,6 +25,7 @@ private:
public:
PeerDoor(boost::asio::io_service& io_service);
boost::asio::ssl::context& getSSLContext() { return mCtx; }
};
#endif