ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 22:15:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks to the AutoSocket code.

Browse Source
This commit is contained in:
JoelKatz
2013-01-24 15:25:14 -08:00
parent a1a31bceff
commit 802f357ff1
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,6 +20,7 @@
SETUP_LOG(); SETUP_LOG();
LogPartition TaggedCachePartition("TaggedCache"); LogPartition TaggedCachePartition("TaggedCache");
LogPartition AutoSocketPartition("AutoSocket");
Application* theApp = NULL; Application* theApp = NULL;
DatabaseCon::DatabaseCon(const std::string& strName, const char *initStrings[], int initCount) DatabaseCon::DatabaseCon(const std::string& strName, const char *initStrings[], int initCount)

21
src/cpp/ripple/AutoSocket.h
View File

@@ -44,10 +44,17 @@ public:
mSocket = boost::make_shared<ssl_socket>(boost::ref(s), boost::ref(c)); mSocket = boost::make_shared<ssl_socket>(boost::ref(s), boost::ref(c));
} }
AutoSocket(basio::io_service& s, bassl::context& c, bool secureOnly, bool plainOnly)
: mSecure(secureOnly), mBuffer((plainOnly || secureOnly) ? 0 : 4)
{
mSocket = boost::make_shared<ssl_socket>(boost::ref(s), boost::ref(c));
}
bool isSecure() { return mSecure; } bool isSecure() { return mSecure; }
ssl_socket& SSLSocket() { return *mSocket; } ssl_socket& SSLSocket() { return *mSocket; }
plain_socket& PlainSocket() { return mSocket->next_layer(); } plain_socket& PlainSocket() { return mSocket->next_layer(); }
void setSSLOnly() { mBuffer.clear(); } void setSSLOnly() { mSecure = true;}
void setPlainOnly() { mBuffer.clear(); }
lowest_layer_type& lowest_layer() { return mSocket->lowest_layer(); } lowest_layer_type& lowest_layer() { return mSocket->lowest_layer(); }
@@ -60,14 +67,21 @@ public:
void async_handshake(handshake_type type, callback cbFunc) void async_handshake(handshake_type type, callback cbFunc)
{ {
if ((type == ssl_socket::client) || (mBuffer.empty())) if ((type == ssl_socket::client) || (mSecure))
{ { // must be ssl
mSecure = true; mSecure = true;
mSocket->async_handshake(type, cbFunc); mSocket->async_handshake(type, cbFunc);
} }
else if (mBuffer.empty())
{ // must be plain
mSecure = false;
cbFunc(error_code());
}
else else
{ // autodetect
mSocket->next_layer().async_receive(basio::buffer(mBuffer), basio::socket_base::message_peek, mSocket->next_layer().async_receive(basio::buffer(mBuffer), basio::socket_base::message_peek,
boost::bind(&AutoSocket::handle_autodetect, this, cbFunc, basio::placeholders::error)); boost::bind(&AutoSocket::handle_autodetect, this, cbFunc, basio::placeholders::error));
}
} }
template <typename ShutdownHandler> void async_shutdown(ShutdownHandler handler) template <typename ShutdownHandler> void async_shutdown(ShutdownHandler handler)
@@ -110,6 +124,7 @@ protected:
(mBuffer[2] < 127) && (mBuffer[2] > 31) && (mBuffer[2] < 127) && (mBuffer[2] > 31) &&
(mBuffer[3] < 127) && (mBuffer[3] > 31)) (mBuffer[3] < 127) && (mBuffer[3] > 31))
{ // not ssl { // not ssl
mSecure = false;
cbFunc(ec); cbFunc(ec);
} }
else else