aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-05-07 09:09:13 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-05-12 17:55:58 +0200
commit1ed6d499b6bf02a399fb32059caccdea847335b0 (patch)
tree2784981073a5b81bd4ce78b2aff64616f403655b
parent010e66188e24b80f9c5d2e9ab3645792cab07f20 (diff)
downloadbitcoin-1ed6d499b6bf02a399fb32059caccdea847335b0.tar.xz
rpc: pass errors from async_accept
According to the [boost::asio documentation](http://www.boost.org/doc/libs/1_55_0/doc/html/boost_asio/reference/basic_socket_acceptor/async_accept/overload2.html), the function signature of the handler must be: void handler( const boost::system::error_code& error // Result of operation. ); We were binding *all* the arguments, instead of all but the error, resulting in nullary function that never got the error. Fix this by adding an input argument substitution. Rebased-By: Wladimir J. van der Laan <laanwj@gmail.com> Rebased-From: 0a0cd34
-rw-r--r--src/rpcserver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index f78cb420f4..fb7a28db77 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -457,7 +457,7 @@ static void RPCListen(boost::shared_ptr< basic_socket_acceptor<Protocol, SocketA
boost::ref(context),
fUseSSL,
conn,
- boost::asio::placeholders::error));
+ _1));
}
@@ -481,6 +481,8 @@ static void RPCAcceptHandler(boost::shared_ptr< basic_socket_acceptor<Protocol,
if (error)
{
delete conn;
+ // TODO: Actually handle errors
+ LogPrintf("%s: Error: %s\n", __func__, error.message());
}
// Restrict callers by IP. It is important to