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

Use MultiSocket and strand in Peer

Browse Source
This commit is contained in:
Vinnie Falco
2013-08-28 12:19:25 -04:00
parent 8e75064fe3
commit 1277f70c47
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeastConfig.h
View File

@@ -163,7 +163,7 @@
// in Peer code if you suspect you're having problems because of it. // in Peer code if you suspect you're having problems because of it.
// //
#ifndef RIPPLE_PEER_USES_BEAST_MULTISOCKET #ifndef RIPPLE_PEER_USES_BEAST_MULTISOCKET
#define RIPPLE_PEER_USES_BEAST_MULTISOCKET 0 #define RIPPLE_PEER_USES_BEAST_MULTISOCKET 1
#endif #endif
// Here temporarily to turn off new Validations code while it // Here temporarily to turn off new Validations code while it

3
modules/ripple_app/peers/ripple_Peer.cpp
View File

@@ -34,7 +34,8 @@ public:
#if RIPPLE_PEER_USES_BEAST_MULTISOCKET #if RIPPLE_PEER_USES_BEAST_MULTISOCKET
ScopedPointer <MultiSocket> m_socket; ScopedPointer <MultiSocket> m_socket;
boost::asio::io_service& m_strand; //boost::asio::io_service& m_strand;
boost::asio::io_service::strand m_strand;
NativeSocketType& getNativeSocket () NativeSocketType& getNativeSocket ()
{ {

4
modules/ripple_net/basics/impl/MultiSocketType.h
View File

@@ -598,7 +598,7 @@ protected:
Socket* new_ssl_stream () Socket* new_ssl_stream ()
{ {
typedef typename boost::asio::ssl::stream <next_layer_type&> SslStream; typedef typename boost::asio::ssl::stream <next_layer_type&> SslStream;
typedef SocketWrapperStrand <SslStream> Wrapper; typedef SocketWrapper <SslStream> Wrapper;
Wrapper* const socket = new Wrapper (m_next_layer, m_ssl_context); Wrapper* const socket = new Wrapper (m_next_layer, m_ssl_context);
set_ssl_stream (socket->this_layer ()); set_ssl_stream (socket->this_layer ());
return socket; return socket;
@@ -614,7 +614,7 @@ protected:
{ {
typedef boost::asio::ssl::stream < typedef boost::asio::ssl::stream <
PrefilledReadStream <next_layer_type&> > SslStream; PrefilledReadStream <next_layer_type&> > SslStream;
typedef SocketWrapperStrand <SslStream> Wrapper; typedef SocketWrapper <SslStream> Wrapper;
Wrapper* const socket = new Wrapper (m_next_layer, m_ssl_context); Wrapper* const socket = new Wrapper (m_next_layer, m_ssl_context);
socket->this_layer ().next_layer().fill (buffers); socket->this_layer ().next_layer().fill (buffers);
set_ssl_stream (socket->this_layer ()); set_ssl_stream (socket->this_layer ());