Attachment 189678 Details for Bug 224187 – patch for rpcserver.cpp

[patch] patch for rpcserver.cpp

patch-src_rpcserver.cpp (text/plain), 2.93 KB, created by Daniel Morante on 2018-01-13 05:08:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Morante

Created: 2018-01-13 05:08:18 UTC

Size: 2.93 KB

patch

obsolete

>--- src/rpcserver.cpp.orig	2018-01-10 23:24:05 UTC
>+++ src/rpcserver.cpp
>@@ -492,8 +492,8 @@ private:
> void ServiceConnection(AcceptedConnection *conn);
> 
> //! Forward declaration required for RPCListen
>-template <typename Protocol, typename SocketAcceptorService>
>-static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
>+template <typename Protocol>
>+static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
>                              ssl::context& context,
>                              bool fUseSSL,
>                              boost::shared_ptr< AcceptedConnection > conn,
>@@ -502,8 +502,8 @@ static void RPCAcceptHandler(boost::shar
> /**
>  * Sets up I/O resources to accept and handle a new connection.
>  */
>-template <typename Protocol, typename SocketAcceptorService>
>-static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
>+template <typename Protocol>
>+static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
>                    ssl::context& context,
>                    const bool fUseSSL)
> {
>@@ -513,7 +513,7 @@ static void RPCListen(boost::shared_ptr<
>     acceptor->async_accept(
>             conn->sslStream.lowest_layer(),
>             conn->peer,
>-            boost::bind(&RPCAcceptHandler<Protocol, SocketAcceptorService>,
>+            boost::bind(&RPCAcceptHandler<Protocol>,
>                 acceptor,
>                 boost::ref(context),
>                 fUseSSL,
>@@ -525,8 +525,8 @@ static void RPCListen(boost::shared_ptr<
> /**
>  * Accept and handle incoming connection.
>  */
>-template <typename Protocol, typename SocketAcceptorService>
>-static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketAcceptorService> > acceptor,
>+template <typename Protocol>
>+static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol> > acceptor,
>                              ssl::context& context,
>                              const bool fUseSSL,
>                              boost::shared_ptr< AcceptedConnection > conn,
>@@ -620,7 +620,7 @@ void StartRPCThreads()
> 
>     assert(rpc_io_service == NULL);
>     rpc_io_service = new boost::asio::io_service();
>-    rpc_ssl_context = new ssl::context(*rpc_io_service, ssl::context::sslv23);
>+    rpc_ssl_context = new ssl::context(ssl::context::sslv23);
> 
>     const bool fUseSSL = GetBoolArg("-rpcssl", false);
> 
>@@ -639,7 +639,7 @@ void StartRPCThreads()
>         else LogPrintf("ThreadRPCServer ERROR: missing server private key file %s\n", pathPKFile.string());
> 
>         string strCiphers = GetArg("-rpcsslciphers", "TLSv1.2+HIGH:TLSv1+HIGH:!SSLv2:!aNULL:!eNULL:!3DES:@STRENGTH");
>-        SSL_CTX_set_cipher_list(rpc_ssl_context->impl(), strCiphers.c_str());
>+        SSL_CTX_set_cipher_list(rpc_ssl_context->native_handle(), strCiphers.c_str());
>     }
> 
>     std::vector<ip::tcp::endpoint> vEndpoints;

Actions: View | Diff

Attachments on bug 224187: 189677 | 189678